PEP8: Fix formatting

* Remove redundant backslash between brackets
* Fix multiple statements on one line
* Fix missing/excess whitespace
* Fix comments not starting with a single # and a space
* Convert tabs to spaces
* Use triple-quoted docstring

core/utorrent/client.py

@@ -1,29 +1,31 @@
-#coding=utf8
+# coding=utf8
+
 import urllib
 import urllib2
 import urlparse
 import cookielib
 import re
 import StringIO
+
 try:
-    import json 
+    import json
 except ImportError:
     import simplejson as json
 
 from core.utorrent.upload import MultiPartForm
 
-class UTorrentClient(object):
 
+class UTorrentClient(object):
     def __init__(self, base_url, username, password):
         self.base_url = base_url
         self.username = username
         self.password = password
         self.opener = self._make_opener('uTorrent', base_url, username, password)
         self.token = self._get_token()
-        #TODO refresh token, when necessary
+        # TODO refresh token, when necessary
 
     def _make_opener(self, realm, base_url, username, password):
-        '''uTorrent API need HTTP Basic Auth and cookie support for token verify.'''
+        """uTorrent API need HTTP Basic Auth and cookie support for token verify."""
 
         auth_handler = urllib2.HTTPBasicAuthHandler()
         auth_handler.add_password(realm=realm,
@@ -31,7 +33,7 @@ class UTorrentClient(object):
                                   user=username,
                                   passwd=password)
         opener = urllib2.build_opener(auth_handler)
-        urllib2.install_opener(opener)     
+        urllib2.install_opener(opener)
 
         cookie_jar = cookielib.CookieJar()
         cookie_handler = urllib2.HTTPCookieProcessor(cookie_jar)
@@ -47,69 +49,68 @@ class UTorrentClient(object):
         match = re.search(token_re, response.read())
         return match.group(1)
 
-       
     def list(self, **kwargs):
         params = [('list', '1')]
         params += kwargs.items()
         return self._action(params)
 
     def start(self, *hashes):
-        params = [('action', 'start'),]
+        params = [('action', 'start'), ]
         for hash in hashes:
             params.append(('hash', hash))
         return self._action(params)
-        
+
     def stop(self, *hashes):
-        params = [('action', 'stop'),]
+        params = [('action', 'stop'), ]
         for hash in hashes:
             params.append(('hash', hash))
         return self._action(params)
- 
+
     def pause(self, *hashes):
-        params = [('action', 'pause'),]
+        params = [('action', 'pause'), ]
         for hash in hashes:
             params.append(('hash', hash))
         return self._action(params)
- 
+
     def forcestart(self, *hashes):
-        params = [('action', 'forcestart'),]
+        params = [('action', 'forcestart'), ]
         for hash in hashes:
             params.append(('hash', hash))
         return self._action(params)
-        
+
     def remove(self, *hashes):
-        params = [('action', 'remove'),]
+        params = [('action', 'remove'), ]
         for hash in hashes:
             params.append(('hash', hash))
         return self._action(params)
-    
+
     def removedata(self, *hashes):
-        params = [('action', 'removedata'),]
+        params = [('action', 'removedata'), ]
         for hash in hashes:
             params.append(('hash', hash))
         return self._action(params)
-        
+
     def recheck(self, *hashes):
-        params = [('action', 'recheck'),]
+        params = [('action', 'recheck'), ]
         for hash in hashes:
             params.append(('hash', hash))
         return self._action(params)
- 
+
     def getfiles(self, hash):
         params = [('action', 'getfiles'), ('hash', hash)]
         return self._action(params)
- 
+
     def getprops(self, hash):
         params = [('action', 'getprops'), ('hash', hash)]
         return self._action(params)
-        
+
     def setprio(self, hash, priority, *files):
         params = [('action', 'setprio'), ('hash', hash), ('p', str(priority))]
         for file_index in files:
             params.append(('f', str(file_index)))
 
         return self._action(params)
-        
+
     def addfile(self, filename, filepath=None, bytes=None):
         params = [('action', 'add-file')]
 
@@ -118,13 +119,13 @@ class UTorrentClient(object):
             file_handler = open(filepath)
         else:
             file_handler = StringIO.StringIO(bytes)
-            
+
         form.add_file('torrent_file', filename.encode('utf-8'), file_handler)
 
         return self._action(params, str(form), form.get_content_type())
 
     def _action(self, params, body=None, content_type=None):
-        #about token, see https://github.com/bittorrent/webui/wiki/TokenSystem
+        # about token, see https://github.com/bittorrent/webui/wiki/TokenSystem
         url = self.base_url + '?token=' + self.token + '&' + urllib.urlencode(params)
         request = urllib2.Request(url)
 
@@ -137,6 +138,5 @@ class UTorrentClient(object):
         try:
             response = self.opener.open(request)
             return response.code, json.loads(response.read())
-        except urllib2.HTTPError,e:
-            raise 
-        
+        except urllib2.HTTPError, e:
+            raise