WIP: 3.0.0 #210

Merged
michaelhelmick merged 43 commits from 3.0.0 into master 2013-06-17 10:51:49 -07:00
Showing only changes of commit 80c428992b - Show all commits

View file

@ -65,7 +65,7 @@ class Twython(EndpointsMixin, object):
if oauth_version == 2: if oauth_version == 2:
self.request_token_url = self.api_url % 'oauth2/token' self.request_token_url = self.api_url % 'oauth2/token'
self.client_args = client_args self.client_args = client_args or {}
default_headers = {'User-Agent': 'Twython v' + __version__} default_headers = {'User-Agent': 'Twython v' + __version__}
if not 'headers' in self.client_args: if not 'headers' in self.client_args:
# If they didn't set any headers, set our defaults for them # If they didn't set any headers, set our defaults for them