Merge pull request #69 from michaelhelmick/master

Dynamic callback url works again, PEP8 clean up

setup.py

@@ -4,7 +4,7 @@ from setuptools import setup
 from setuptools import find_packages
 
 __author__ = 'Ryan McGrath <ryan@venodesigns.net>'
-__version__ = '1.5.0'
+__version__ = '1.5.1'
 
 setup(
     # Basic package information.

twython/twython.py

@@ -9,7 +9,7 @@
 """
 
 __author__ = "Ryan McGrath <ryan@venodesigns.net>"
-__version__ = "1.5.0"
+__version__ = "1.5.1"
 
 import urllib
 import re
@@ -95,6 +95,7 @@ class TwythonAPILimit(TwythonError):
     def __str__(self):
         return repr(self.msg)
 
+
 class APILimit(TwythonError):
     """
         Raised when you've hit an API limit. Try to avoid these, read the API
@@ -242,9 +243,6 @@ class Twython(object):
         request_args['oauth_callback'] = callback_url
         method = 'get'
 
-        if not OAUTH_LIB_SUPPORTS_CALLBACK:
-            method = 'post'
-        
         func = getattr(self.client, method)
         response = func(self.request_token_url, data=request_args)
 
@@ -310,10 +308,10 @@ class Twython(object):
             'query': url_to_shorten
         })
 
-        if r.status_code in [301, 201, 200]:
+        if request.status_code in [301, 201, 200]:
             return request.text
         else:
-            raise TwythonError('shortenURL() failed with a %s error code.' % r.status_code)
+            raise TwythonError('shortenURL() failed with a %s error code.' % request.status_code)
 
     @staticmethod
     def constructApiURL(base_url, params):
@@ -623,7 +621,7 @@ class Twython(object):
 
         for line in stream.iter_lines():
             if line:
-                callback(json.loads(line))
+                callback(simplejson.loads(line))
 
     @staticmethod
     def unicode2utf8(text):