Merge pull request #583 from kimtree/clean-up-code

Remove deprecated function and clean up codes
tweepy · Nov 5, 2015 · 89d8197 · 89d8197
2 parents 2ceda61 + b7b865f
commit 89d8197
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/tweepy/auth.py b/tweepy/auth.py
@@ -123,7 +123,6 @@ def get_xauth_access_token(self, username, password):
                                        'x_auth_username': username,
                                        'x_auth_password': password})
 
-            print(r.content)
             credentials = parse_qs(r.content)
             return credentials.get('oauth_token')[0], credentials.get('oauth_token_secret')[0]
         except Exception as e:

diff --git a/tweepy/parsers.py b/tweepy/parsers.py
@@ -64,7 +64,7 @@ def parse(self, method, payload):
 
     def parse_error(self, payload):
         error = self.json_lib.loads(payload)
-        if error.has_key('error'):
+        if 'error' in error:
             return error['error']
         else:
             return error['errors']