pep8 format code

Author: bingwen

qingcloud/app/connection.py

@@ -3,6 +3,7 @@
 from . import constants as const
 from __builtin__ import str
 
+
 class AppConnection(APIConnection):
 
     def __init__(self, app_id, secret_app_key, zone,
@@ -26,7 +27,7 @@ def __init__(self, app_id, secret_app_key, zone,
                                                           secret_app_key,
                                                           access_token)
 
-    def send_request(self, action, body, url='/app/', verb ='GET'):
+    def send_request(self, action, body, url='/app/', verb='GET'):
         """ Send request
         """
         return super(AppConnection, self).send_request(action, body, url, verb)
@@ -71,5 +72,3 @@ def unlease_app(self, resources):
         body = {"resources": resources}
 
         return self.send_request(action, body)
-
-

qingcloud/conn/auth.py

@@ -33,6 +33,7 @@
 from qingcloud.misc.utils import get_utf8_value, get_ts, base64_url_decode,\
     base64_url_encode
 
+
 class HmacKeys(object):
     """ Key based Auth handler helper.
     """
@@ -77,6 +78,7 @@ def sign_string(self, string_to_sign):
         to_sign = self.digest(string_to_sign)
         return base64.b64encode(to_sign).strip()
 
+
 class QuerySignatureAuthHandler(HmacKeys):
     """ Provides Query Signature Authentication.
     """
@@ -99,7 +101,7 @@ def _calc_signature(self, params, verb, path):
                          urllib.quote(val, safe='-_~'))
         qs = '&'.join(pairs)
         string_to_sign += qs
-        #print "string to sign:[%s]" % string_to_sign
+        # print "string to sign:[%s]" % string_to_sign
         b64 = self.sign_string(string_to_sign)
         return (qs, b64)
 
@@ -113,14 +115,14 @@ def add_auth(self, req, **kwargs):
         req.params['time_stamp'] = time_stamp
         qs, signature = self._calc_signature(req.params, req.method,
                                              req.auth_path)
-        #print 'query_string: %s Signature: %s' % (qs, signature)
+        # print 'query_string: %s Signature: %s' % (qs, signature)
         if req.method == 'POST':
             # req and retried req should not have signature
             params = req.params.copy()
             params["signature"] = signature
             req.body = urllib.urlencode(params)
             req.header = {
-                'Content-Length' : str(len(req.body)),
+                'Content-Length': str(len(req.body)),
                 'Content-Type': 'application/x-www-form-urlencoded',
                 'Accept': 'text/plain',
                 'Connection': 'Keep-Alive'
@@ -131,11 +133,13 @@ def add_auth(self, req, **kwargs):
             # already be there, we need to get rid of that and rebuild it
             req.path = req.path.split('?')[0]
             req.path = (req.path + '?' + qs +
-                                 '&signature=' + urllib.quote_plus(signature))
+                        '&signature=' + urllib.quote_plus(signature))
+
 
 class AppSignatureAuthHandler(QuerySignatureAuthHandler):
     """ Provides App Signature Authentication.
     """
+
     def __init__(self, app_id, secret_app_key, access_token=None):
 
         HmacKeys.__init__(self, "", app_id, secret_app_key)
@@ -181,14 +185,14 @@ def add_auth(self, req, **kwargs):
         req.params['time_stamp'] = time_stamp
         qs, signature = self._calc_signature(req.params, req.method,
                                              req.auth_path)
-        #print 'query_string: %s Signature: %s' % (qs, signature)
+        # print 'query_string: %s Signature: %s' % (qs, signature)
         if req.method == 'POST':
             # req and retried req should not have signature
             params = req.params.copy()
             params["signature"] = signature
             req.body = urllib.urlencode(params)
             req.header = {
-                'Content-Length' : str(len(req.body)),
+                'Content-Length': str(len(req.body)),
                 'Content-Type': 'application/x-www-form-urlencoded',
                 'Accept': 'text/plain',
                 'Connection': 'Keep-Alive'
@@ -199,7 +203,8 @@ def add_auth(self, req, **kwargs):
             # already be there, we need to get rid of that and rebuild it
             req.path = req.path.split('?')[0]
             req.path = (req.path + '?' + qs +
-                                 '&signature=' + signature)
+                        '&signature=' + signature)
+
 
 class QSSignatureAuthHandler(HmacKeys):
 
@@ -231,7 +236,8 @@ def _generate_signature(self, method, auth_path, params, headers):
         string_to_sign += "\n%s" % date_str
 
         # Generate signed headers
-        signed_headers = filter(lambda x: x.lower().startswith("x-qs-"), headers.keys())
+        signed_headers = filter(
+            lambda x: x.lower().startswith("x-qs-"), headers.keys())
         for param in sorted(signed_headers):
             string_to_sign += "\n%s:%s" % (param.lower(), headers[param])
 
@@ -275,7 +281,7 @@ def get_auth_parameters(self, method, auth_path, expires, params=None, headers=N
         ]
 
         signature = self._generate_signature(method, auth_path,
-                                             params+auth_params,
+                                             params + auth_params,
                                              headers or {})
 
         auth_params.append(("X-QS-Signature", signature))

qingcloud/conn/connection.py

@@ -26,7 +26,7 @@ class ConnectionQueue(object):
     """ Http connection queue
     """
 
-    def __init__(self, timeout = 60):
+    def __init__(self, timeout=60):
         self.queue = []
         self.timeout = timeout
 
@@ -68,7 +68,7 @@ class ConnectionPool(object):
 
     CLEAR_INTERVAL = 5.0
 
-    def __init__(self, timeout = 60):
+    def __init__(self, timeout=60):
         self.timeout = timeout
         self.last_clear_time = time.time()
         self.lock = threading.Lock()
@@ -113,7 +113,7 @@ def _clear(self):
 class HTTPRequest(object):
 
     def __init__(self, method, protocol, header, host, port, path,
-                 params, auth_path=None, body = ""):
+                 params, auth_path=None, body=""):
         """
         Represents an HTTP request.
 
@@ -179,8 +179,8 @@ class HttpConnection(object):
     """
 
     def __init__(self, qy_access_key_id, qy_secret_access_key, host=None,
-            port=443, protocol="https", pool=None, expires=None,
-            http_socket_timeout=10, debug=False):
+                 port=443, protocol="https", pool=None, expires=None,
+                 http_socket_timeout=10, debug=False):
         """
         @param qy_access_key_id - the access key id
         @param qy_secret_access_key - the secret access key
@@ -237,16 +237,19 @@ def _new_conn(self, host, port):
         """ Create new connection
         """
         if self.secure:
-            conn = httplib.HTTPSConnection(host, port, timeout=self.http_socket_timeout)
+            conn = httplib.HTTPSConnection(
+                host, port, timeout=self.http_socket_timeout)
         else:
-            conn = httplib.HTTPConnection(host, port, timeout=self.http_socket_timeout)
+            conn = httplib.HTTPConnection(
+                host, port, timeout=self.http_socket_timeout)
         # Use self-defined Response class
         conn.response_class = HTTPResponse
         return conn
 
     def build_http_request(self, method, path, params, auth_path, headers,
-            host, data):
-        raise NotImplementedError("The build_http_request method must be implemented")
+                           host, data):
+        raise NotImplementedError(
+            "The build_http_request method must be implemented")
 
     def send(self, method, path, params=None, headers=None, host=None,
              auth_path=None, data=""):
@@ -262,7 +265,7 @@ def send(self, method, path, params=None, headers=None, host=None,
 
         # Build the http request
         request = self.build_http_request(method, path, params, auth_path,
-            headers, host, data)
+                                          headers, host, data)
         request.authorize(self)
 
         conn_host = host