diff --git a/AUTHORS b/AUTHORS index 79d15a6..fbda6b4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -10,4 +10,5 @@ Patches and Suggestions ``````````````````````` - The Convore Peeps -- Adi J. Sieker +- Adi J. Sieker +- Cole Kowalski diff --git a/README.rst b/README.rst index 8741ff7..47e0f43 100644 --- a/README.rst +++ b/README.rst @@ -61,7 +61,7 @@ Hmm.. :: Installation ------------ -To install tablib, simply: :: +To install convore, simply: :: $ pip install convore diff --git a/convore/api.py b/convore/api.py index 9731155..a08cf7c 100644 --- a/convore/api.py +++ b/convore/api.py @@ -92,10 +92,9 @@ class Groups(SyncedList): __data_keys__ = ['id', 'slug'] def __init__(self): - super(Groups, self).__init__() - self.discover = groups.GroupsDiscover() self.discover.parent = self + super(Groups, self).__init__() def joined(self): """Returns list of Joined groups.""" @@ -129,8 +128,8 @@ class Topics(SyncedList): __data_keys__ = ['id', 'slug'] def __init__(self, group): - super(Topics, self).__init__() self.group = group + super(Topics, self).__init__() def list(self): return self.data @@ -175,8 +174,8 @@ class Messages(SyncedList): __data_keys__ = ['id'] def __init__(self, topic): - super(Messages, self).__init__() self.topic = topic + super(Messages, self).__init__() def list(self): return self.data diff --git a/reqs.txt b/reqs.txt index 31f7773..6f05da3 100644 --- a/reqs.txt +++ b/reqs.txt @@ -1,2 +1,2 @@ -requests=0.3.0 +requests=0.3.4 unittest2 \ No newline at end of file diff --git a/setup.py b/setup.py index 3eb3538..95d32ca 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ setup( author='Kenneth Reitz', author_email='me@kennethreitz.com', url='https://github.com/kennethreitz/python-convore', - packages= ['convore'], + packages= ['convore', 'convore.packages', 'convore.packages.anyjson'], install_requires=required, license='ISC', classifiers=( diff --git a/test.py b/test.py deleted file mode 100644 index 70b08b6..0000000 --- a/test.py +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -import os -from convore import Convore - - -CONVORE_NAME = os.environ.get('CONVORE_NAME', 'requeststest') -CONVORE_PASS = os.environ.get('CONVORE_PASS', 'requeststest') - -convore = Convore(CONVORE_NAME, CONVORE_PASS) - -#print convore.groups.discover.category -convore.groups.discover.search('github')