Merge branch 'master' into safe_comments_data

Author: wkoot

.gitignore

@@ -2,4 +2,3 @@
 .DS_Store
 *.swp
 test_settings.py
-

tests.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
-
 import types
 import six
+
 try:
     import simplejson as json
 except ImportError:
@@ -17,43 +17,42 @@
 access_token = "DEBUG"
 redirect_uri = "http://example.com"
 
-class MockHttp(object):
 
+class MockHttp(object):
     def __init__(self, *args, **kwargs):
         pass
 
     def request(self, url, method="GET", body=None, headers={}):
-        fail_state = {
-            'status':'400'
-        }, "{}"
+        fail_state = {'status': '400'}, "{}"
 
         parsed = urlparse(url)
         options = parse_qs(parsed.query)
 
         fn_name = str(active_call)
         if fn_name == 'get_authorize_login_url':
             return {
-                'status': '200',
-                'content-location':'http://example.com/redirect/login'
-            }, None
+                       'status': '200',
+                       'content-location': 'http://example.com/redirect/login'
+                   }, None
 
-        if not 'access_token' in options and not 'client_id' in options:
+        if 'access_token' not in options and 'client_id' not in options:
             fn_name += '_unauthorized'
-        if 'self' in url and not 'access_token' in options:
+        if 'self' in url and 'access_token' not in options:
             fn_name += '_no_auth_user'
 
         fl = open('fixtures/%s.json' % fn_name)
         content = fl.read()
         fl.close()
+
         json_content = json.loads(content)
         status = json_content['meta']['code']
-        return {
-            'status': status
-        }, content
+        return {'status': status}, content
 
-oauth2.Http = MockHttp
 
+oauth2.Http = MockHttp
 active_call = None
+
+
 class TestInstagramAPI(client.InstagramAPI):
     def __getattribute__(self, attr):
         global active_call
@@ -62,13 +61,15 @@ def __getattribute__(self, attr):
             active_call = attr
         return actual_val
 
+
 class InstagramAuthTests(unittest.TestCase):
     def setUp(self):
         self.unauthenticated_api = TestInstagramAPI(client_id=client_id, redirect_uri=redirect_uri, client_secret=client_secret)
 
     def test_authorize_login_url(self):
         redirect_uri = self.unauthenticated_api.get_authorize_login_url()
         assert redirect_uri
+
         print("Please visit and authorize at:\n%s" % redirect_uri)
         code = raw_input("Paste received code (blank to skip): ").strip()
         if not code:
@@ -83,12 +84,13 @@ def test_xauth_exchange(self):
         username = raw_input("Enter username for XAuth (blank to skip): ").strip()
         if not username:
             return
-        password =  getpass.getpass("Enter password for XAuth (blank to skip): ").strip()
+
+        password = getpass.getpass("Enter password for XAuth (blank to skip): ").strip()
         access_token = self.unauthenticated_api.exchange_xauth_login_for_access_token(username, password)
         assert access_token
 
-class InstagramAPITests(unittest.TestCase):
 
+class InstagramAPITests(unittest.TestCase):
     def setUp(self):
         super(InstagramAPITests, self).setUp()
         self.client_only_api = TestInstagramAPI(client_id=client_id)
@@ -98,8 +100,8 @@ def test_media_popular(self):
         self.api.media_popular(count=10)
 
     def test_media_search(self):
-        self.client_only_api.media_search(lat=37.7,lng=-122.22)
-        self.api.media_search(lat=37.7,lng=-122.22)
+        self.client_only_api.media_search(lat=37.7, lng=-122.22)
+        self.api.media_search(lat=37.7, lng=-122.22)
 
     def test_media_shortcode(self):
         self.client_only_api.media_shortcode('os1NQjxtvF')
@@ -144,43 +146,39 @@ def test_user_liked_media(self):
     def test_user_recent_media(self):
         media, url = self.api.user_recent_media(count=10)
 
-        self.assertTrue( all( [hasattr(obj, 'type') for obj in media] ) )
+        self.assertTrue(all([hasattr(obj, 'type') for obj in media]))
 
         image = media[0]
         self.assertEqual(
-                image.get_standard_resolution_url(),
-                "http://distillery-dev.s3.amazonaws.com/media/2011/02/02/1ce5f3f490a640ca9068e6000c91adc5_7.jpg")
+            image.get_standard_resolution_url(),
+            "http://distillery-dev.s3.amazonaws.com/media/2011/02/02/1ce5f3f490a640ca9068e6000c91adc5_7.jpg")
 
         self.assertEqual(
-                image.get_low_resolution_url(),
-                "http://distillery-dev.s3.amazonaws.com/media/2011/02/02/1ce5f3f490a640ca9068e6000c91adc5_6.jpg")
+            image.get_low_resolution_url(),
+            "http://distillery-dev.s3.amazonaws.com/media/2011/02/02/1ce5f3f490a640ca9068e6000c91adc5_6.jpg")
 
         self.assertEqual(
-                image.get_thumbnail_url(),
-                "http://distillery-dev.s3.amazonaws.com/media/2011/02/02/1ce5f3f490a640ca9068e6000c91adc5_5.jpg")
+            image.get_thumbnail_url(),
+            "http://distillery-dev.s3.amazonaws.com/media/2011/02/02/1ce5f3f490a640ca9068e6000c91adc5_5.jpg")
 
-        self.assertEqual( False, hasattr(image, 'videos') )
+        self.assertEqual(False, hasattr(image, 'videos'))
 
         video = media[1]
         self.assertEqual(
-                video.get_standard_resolution_url(),
-                video.videos['standard_resolution'].url)
+            video.get_standard_resolution_url(),
+            video.videos['standard_resolution'].url)
 
         self.assertEqual(
-                video.get_standard_resolution_url(),
-                "http://distilleryvesper9-13.ak.instagram.com/090d06dad9cd11e2aa0912313817975d_101.mp4")
+            video.get_standard_resolution_url(),
+            "http://distilleryvesper9-13.ak.instagram.com/090d06dad9cd11e2aa0912313817975d_101.mp4")
 
         self.assertEqual(
-                video.get_low_resolution_url(),
-                "http://distilleryvesper9-13.ak.instagram.com/090d06dad9cd11e2aa0912313817975d_102.mp4")
+            video.get_low_resolution_url(),
+            "http://distilleryvesper9-13.ak.instagram.com/090d06dad9cd11e2aa0912313817975d_102.mp4")
 
         self.assertEqual(
-                video.get_thumbnail_url(),
-                "http://distilleryimage2.ak.instagram.com/11f75f1cd9cc11e2a0fd22000aa8039a_5.jpg")
-
-
-
-
+            video.get_thumbnail_url(),
+            "http://distilleryimage2.ak.instagram.com/11f75f1cd9cc11e2a0fd22000aa8039a_5.jpg")
 
     def test_user_search(self):
         self.api.user_search('mikeyk', 10)
@@ -204,7 +202,7 @@ def test_location_recent_media(self):
         self.api.location_recent_media(location_id=1)
 
     def test_location_search(self):
-        self.api.location_search(lat=37.7,lng=-122.22, distance=2500)
+        self.api.location_search(lat=37.7, lng=-122.22, distance=2500)
 
     def test_location(self):
         self.api.location(1)
@@ -225,12 +223,6 @@ def test_tag(self):
     def test_user_follows(self):
         self.api.user_follows()
 
-    def test_user_followed_by(self):
-        self.api.user_followed_by()
-
-    def test_user_followed_by(self):
-        self.api.user_followed_by()
-
     def test_user_requested_by(self):
         self.api.user_followed_by()
 
@@ -246,6 +238,7 @@ def test_change_relationship(self):
     def test_geography_recent_media(self):
         self.api.geography_recent_media(geography_id=1)
 
+
 if __name__ == '__main__':
     if not TEST_AUTH:
         del InstagramAuthTests