kennethreitz-archive/python-convore
1
0
Fork 0
mirror of https://github.com/kennethreitz-archive/python-convore.git synced 2026-06-05 23:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'adi' into async

Browse Source 
Conflicts:
	convore/api.py
This commit is contained in:
Adi Sieker
2011-05-17 23:36:26 +02:00
parent 28c144004a b5de5d9fc9
commit c50b67265f
6 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AUTHORS
+2 -1
View File
@@ -10,4 +10,5 @@ Patches and Suggestions
```````````````````````
- The Convore Peeps
- Adi J. Sieker <adi@sieker.info>
- Adi J. Sieker <adi@sieker.io>
- Cole Kowalski <colekowalski@gmail.com>
README.rst
+1 -1
View File
@@ -61,7 +61,7 @@ Hmm.. ::
Installation
------------
To install tablib, simply: ::
To install convore, simply: ::
$ pip install convore
convore/api.py
+1
View File
@@ -479,3 +479,4 @@ class Endpoints(object):
def call(self, endpoint, **params):
return endpoint.call(auth=self.auth, **params)
reqs.txt
+1 -1
View File
@@ -1,2 +1,2 @@
requests=0.3.0
requests=0.3.4
unittest2
setup.py
+1 -1
View File
@@ -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=(
test.py
-14
View File
@@ -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')