Skip to content

Commit

Permalink
minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ckoepp committed Jul 2, 2013
1 parent bd9843a commit cd3417e
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ language: python
python:
- "2.6"
- "2.7"
- "3.1"
- "3.2"
- "3.3"
script: nosetests
branches:
only:
Expand Down
2 changes: 1 addition & 1 deletion README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ The result will be a text looking similar to this one. But as you see unfortunat
@nkoni7 tweeted: Familien sind auch betroffen wenn schlechte Politik gemacht wird. Nicht nur wenn Guttenberg seine Doktorarbeit fälscht ! #absolutemehrheit
```

##Wanna have more details?
##Wanna see more details?
If you'd like to get more information about how TwitterSearch works interally and how to use it with all it's possibilities have a look at the [Wiki](https://github.com/ckoepp/TwitterSearch/wiki).

##License (MIT)
Expand Down
10 changes: 6 additions & 4 deletions TwitterSearch/TwitterSearch.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import oauth2 as oauth
import requests
from oauthlib import oauth1 as oauth
from sys import maxint
from urlparse import parse_qs
from TwitterSearchException import TwitterSearchException
Expand Down Expand Up @@ -56,9 +57,10 @@ def isNextpage(self):
return False

def authenticate(self, verify=False):
consumer = oauth.Consumer(key = self.__consumer_key, secret = self.__consumer_secret)
token = oauth.Token(key = self.__access_token, secret = self.__access_token_secret)
self.__client = oauth.Client(consumer, token)
#consumer = oauth.Consumer(key = self.__consumer_key, secret = self.__consumer_secret)
#token = oauth.Token(key = self.__access_token, secret = self.__access_token_secret)
#self.__client = oauth.Client(consumer, token)


if verify:
meta, response = self.__client.request(self.base_url + self.verify_url, 'GET')
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
oauth2>=1.5.200
requests>=1.0.0
requests-oauthlib>=0.3.0
simplejson>=2.5

0 comments on commit cd3417e

Please sign in to comment.