Merge pull request tweepy#250 from santosh/master

joshthecoder · joshthecoder · commit c060f7b33eee · 2013-05-14T21:03:53.000-07:00
Changed all Tabs to Spaces
diff --git a/examples/streaming.py b/examples/streaming.py
@@ -2,7 +2,7 @@
 from tweepy import OAuthHandler
 from tweepy import Stream
 
-# Go to http://dev.twitter.com and create an app. 
+# Go to http://dev.twitter.com and create an app.
 # The consumer key and secret will be generated for you after
 consumer_key=""
 consumer_secret=""
@@ -13,21 +13,21 @@
 access_token_secret=""
 
 class StdOutListener(StreamListener):
-	""" A listener handles tweets are the received from the stream. 
-	This is a basic listener that just prints received tweets to stdout.
+    """ A listener handles tweets are the received from the stream.
+    This is a basic listener that just prints received tweets to stdout.
 
-	"""
-	def on_data(self, data):
-		print data
-		return True
+    """
+    def on_data(self, data):
+        print data
+        return True
 
-	def on_error(self, status):
-		print status
+    def on_error(self, status):
+        print status
 
 if __name__ == '__main__':
-	l = StdOutListener()
-	auth = OAuthHandler(consumer_key, consumer_secret)
-	auth.set_access_token(access_token, access_token_secret)
+    l = StdOutListener()
+    auth = OAuthHandler(consumer_key, consumer_secret)
+    auth.set_access_token(access_token, access_token_secret)
 
-	stream = Stream(auth, l)	
-	stream.filter(track=['basketball'])
+    stream = Stream(auth, l)
+    stream.filter(track=['basketball'])
diff --git a/tweepy/api.py b/tweepy/api.py
@@ -260,7 +260,7 @@ def me(self):
 
     """ Perform bulk look up of friendships from user ID or screenname """
     def lookup_friendships(self, user_ids=None, screen_names=None):
-	    return self._lookup_friendships(list_to_csv(user_ids), list_to_csv(screen_names))
+        return self._lookup_friendships(list_to_csv(user_ids), list_to_csv(screen_names))
 
     _lookup_friendships = bind_api(
         path = '/friendships/lookup.json',
diff --git a/tweepy/auth.py b/tweepy/auth.py
@@ -138,9 +138,9 @@ def get_xauth_access_token(self, username, password):
                 oauth_consumer=self._consumer,
                 http_method='POST', http_url=url,
                 parameters = {
-		            'x_auth_mode': 'client_auth',
-		            'x_auth_username': username,
-		            'x_auth_password': password
+                    'x_auth_mode': 'client_auth',
+                    'x_auth_username': username,
+                    'x_auth_password': password
                 }
             )
             request.sign_request(self._sigmethod, self._consumer, None)
diff --git a/tweepy/models.py b/tweepy/models.py
@@ -315,7 +315,7 @@ def parse(cls, api, json):
         result = cls(api)
         for k,v in json.items():
             if k == 'connections':
-            	setattr(result, 'is_following', 'following' in v)
+                setattr(result, 'is_following', 'following' in v)
                 setattr(result, 'is_followed_by', 'followed_by' in v)
             else:
                 setattr(result, k, v)

Original file line number	Diff line number	Diff line change
`@@ -138,9 +138,9 @@ def get_xauth_access_token(self, username, password):`
`138`	`138`	`oauth_consumer=self._consumer,`
`139`	`139`	`http_method='POST', http_url=url,`
`140`	`140`	`parameters = {`
`141`		`- 'x_auth_mode': 'client_auth',`
`142`		`- 'x_auth_username': username,`
`143`		`- 'x_auth_password': password`
	`141`	`+ 'x_auth_mode': 'client_auth',`
	`142`	`+ 'x_auth_username': username,`
	`143`	`+ 'x_auth_password': password`
`144`	`144`	`}`
`145`	`145`	`)`
`146`	`146`	`request.sign_request(self._sigmethod, self._consumer, None)`