PEP8: Wrap 80+ column lines.

Author: tseaver

example/client.py

@@ -41,55 +41,64 @@
 CALLBACK_URL = 'http://printer.example.com/request_token_ready'
 RESOURCE_URL = 'http://photos.example.net/photos'
 
-# key and secret granted by the service provider for this consumer application - same as the MockOAuthDataStore
+# key and secret granted by the service provider for this consumer
+# application - same as the MockOAuthDataStore
 CONSUMER_KEY = 'key'
 CONSUMER_SECRET = 'secret'
 
 # example client using httplib with headers
 class SimpleOAuthClient(oauth.OAuthClient):
 
-    def __init__(self, server, port=httplib.HTTP_PORT, request_token_url='', access_token_url='', authorization_url=''):
+    def __init__(self, server, port=httplib.HTTP_PORT, request_token_url='',
+                 access_token_url='', authorization_url=''):
         self.server = server
         self.port = port
         self.request_token_url = request_token_url
         self.access_token_url = access_token_url
         self.authorization_url = authorization_url
-        self.connection = httplib.HTTPConnection("%s:%d" % (self.server, self.port))
+        self.connection = httplib.HTTPConnection(
+                            "%s:%d" % (self.server, self.port))
 
     def fetch_request_token(self, oauth_request):
         # via headers
         # -> OAuthToken
-        self.connection.request(oauth_request.http_method, self.request_token_url, headers=oauth_request.to_header()) 
+        self.connection.request(oauth_request.http_method,
+            self.request_token_url, headers=oauth_request.to_header()) 
         response = self.connection.getresponse()
         return oauth.OAuthToken.from_string(response.read())
 
     def fetch_access_token(self, oauth_request):
         # via headers
         # -> OAuthToken
-        self.connection.request(oauth_request.http_method, self.access_token_url, headers=oauth_request.to_header()) 
+        self.connection.request(oauth_request.http_method,
+            self.access_token_url, headers=oauth_request.to_header()) 
         response = self.connection.getresponse()
         return oauth.OAuthToken.from_string(response.read())
 
     def authorize_token(self, oauth_request):
         # via url
         # -> typically just some okay response
-        self.connection.request(oauth_request.http_method, oauth_request.to_url()) 
+        self.connection.request(oauth_request.http_method,
+            oauth_request.to_url()) 
         response = self.connection.getresponse()
         return response.read()
 
     def access_resource(self, oauth_request):
         # via post body
         # -> some protected resources
         headers = {'Content-Type' :'application/x-www-form-urlencoded'}
-        self.connection.request('POST', RESOURCE_URL, body=oauth_request.to_postdata(), headers=headers)
+        self.connection.request('POST', RESOURCE_URL,
+                                body=oauth_request.to_postdata(),
+                                headers=headers)
         response = self.connection.getresponse()
         return response.read()
 
 def run_example():
 
     # setup
     print('** OAuth Python Library Example **')
-    client = SimpleOAuthClient(SERVER, PORT, REQUEST_TOKEN_URL, ACCESS_TOKEN_URL, AUTHORIZATION_URL)
+    client = SimpleOAuthClient(SERVER, PORT, REQUEST_TOKEN_URL,
+                               ACCESS_TOKEN_URL, AUTHORIZATION_URL)
     consumer = oauth.OAuthConsumer(CONSUMER_KEY, CONSUMER_SECRET)
     signature_method_plaintext = oauth.OAuthSignatureMethod_PLAINTEXT()
     signature_method_hmac_sha1 = oauth.OAuthSignatureMethod_HMAC_SHA1()
@@ -98,7 +107,8 @@ def run_example():
     # get request token
     print('* Obtain a request token ...')
     pause()
-    oauth_request = oauth.OAuthRequest.from_consumer_and_token(consumer, callback=CALLBACK_URL, http_url=client.request_token_url)
+    oauth_request = oauth.OAuthRequest.from_consumer_and_token(
+        consumer, callback=CALLBACK_URL, http_url=client.request_token_url)
     oauth_request.sign_request(signature_method_plaintext, consumer, None)
     print('REQUEST (via headers)')
     print('parameters: %s' % str(oauth_request.parameters))
@@ -112,7 +122,8 @@ def run_example():
 
     print('* Authorize the request token ...')
     pause()
-    oauth_request = oauth.OAuthRequest.from_token_and_callback(token=token, http_url=client.authorization_url)
+    oauth_request = oauth.OAuthRequest.from_token_and_callback(
+        token=token, http_url=client.authorization_url)
     print('REQUEST (via url query string)')
     print('parameters: %s' % str(oauth_request.parameters))
     pause()
@@ -131,7 +142,9 @@ def run_example():
     # get access token
     print('* Obtain an access token ...')
     pause()
-    oauth_request = oauth.OAuthRequest.from_consumer_and_token(consumer, token=token, verifier=verifier, http_url=client.access_token_url)
+    oauth_request = oauth.OAuthRequest.from_consumer_and_token(
+        consumer, token=token, verifier=verifier,
+        http_url=client.access_token_url)
     oauth_request.sign_request(signature_method_plaintext, consumer, token)
     print('REQUEST (via headers)')
     print('parameters: %s' % str(oauth_request.parameters))
@@ -145,8 +158,11 @@ def run_example():
     # access some protected resources
     print('* Access protected resources ...')
     pause()
-    parameters = {'file': 'vacation.jpg', 'size': 'original'} # resource specific params
-    oauth_request = oauth.OAuthRequest.from_consumer_and_token(consumer, token=token, http_method='POST', http_url=RESOURCE_URL, parameters=parameters)
+    parameters = {'file': 'vacation.jpg',
+                  'size': 'original'} # resource specific params
+    oauth_request = oauth.OAuthRequest.from_consumer_and_token(consumer,
+        token=token, http_method='POST', http_url=RESOURCE_URL,
+        parameters=parameters)
     oauth_request.sign_request(signature_method_hmac_sha1, consumer, token)
     print('REQUEST (via post body)')
     print('parameters: %s' % str(oauth_request.parameters))

example/server.py

@@ -60,7 +60,11 @@ def lookup_token(self, token_type, token):
         return None
 
     def lookup_nonce(self, oauth_consumer, oauth_token, nonce):
-        if oauth_token and oauth_consumer.key == self.consumer.key and (oauth_token.key == self.request_token.key or oauth_token.key == self.access_token.key) and nonce == self.nonce:
+        if (oauth_token and
+            oauth_consumer.key == self.consumer.key and
+            (oauth_token.key == self.request_token.key or
+             oauth_token.key == self.access_token.key) and
+            nonce == self.nonce):
             return self.nonce
         return None
 
@@ -74,7 +78,9 @@ def fetch_request_token(self, oauth_consumer, oauth_callback):
         return None
 
     def fetch_access_token(self, oauth_consumer, oauth_token, oauth_verifier):
-        if oauth_consumer.key == self.consumer.key and oauth_token.key == self.request_token.key and oauth_verifier == self.verifier:
+        if (oauth_consumer.key == self.consumer.key and
+            oauth_token.key == self.request_token.key and
+            oauth_verifier == self.verifier):
             # want to check here if token is authorized
             # for mock store, we assume it is
             return self.access_token
@@ -91,8 +97,10 @@ class RequestHandler(BaseHTTPRequestHandler):
 
     def __init__(self, *args, **kwargs):
         self.oauth_server = oauth.OAuthServer(MockOAuthDataStore())
-        self.oauth_server.add_signature_method(oauth.OAuthSignatureMethod_PLAINTEXT())
-        self.oauth_server.add_signature_method(oauth.OAuthSignatureMethod_HMAC_SHA1())
+        self.oauth_server.add_signature_method(
+                    oauth.OAuthSignatureMethod_PLAINTEXT())
+        self.oauth_server.add_signature_method(
+                    oauth.OAuthSignatureMethod_HMAC_SHA1())
         BaseHTTPRequestHandler.__init__(self, *args, **kwargs)
 
     # example way to send an oauth error
@@ -119,7 +127,8 @@ def do_GET(self):
                 pass
 
         # construct the oauth request from the request parameters
-        oauth_request = oauth.OAuthRequest.from_request(self.command, self.path, headers=self.headers, query_string=postdata)
+        oauth_request = oauth.OAuthRequest.from_request(self.command,
+            self.path, headers=self.headers, query_string=postdata)
 
         # request token
         if self.path.startswith(REQUEST_TOKEN_URL):
@@ -170,7 +179,8 @@ def do_GET(self):
         if self.path.startswith(RESOURCE_URL):
             try:
                 # verify the request has been oauth authorized
-                consumer, token, params = self.oauth_server.verify_request(oauth_request)
+                consumer, token, params = self.oauth_server.verify_request(
+                                                    oauth_request)
                 # send okay response
                 self.send_response(200, 'OK')
                 self.end_headers()

oauth2/__init__.py

@@ -99,11 +99,17 @@ def to_unicode(s):
     message if s is not unicode, ascii, or utf-8. """
     if not isinstance(s, unicode):
         if not isinstance(s, str):
-            raise TypeError('You are required to pass either unicode or string here, not: %r (%s)' % (type(s), s))
+            raise TypeError('You are required to pass either unicode or '
+                            'string here, not: %r (%s)' % (type(s), s))
         try:
             s = s.decode('utf-8')
         except UnicodeDecodeError as le:
-            raise TypeError('You are required to pass either a unicode object or a utf-8 string here. You passed a Python string object which contained non-utf-8: %r. The UnicodeDecodeError that resulted from attempting to interpret it as utf-8 was: %s' % (s, le,))
+            raise TypeError('You are required to pass either a unicode '
+                            'object or a utf-8 string here. You passed a '
+                            'Python string object which contained non-utf-8: '
+                            '%r. The UnicodeDecodeError that resulted from '
+                            'attempting to interpret it as utf-8 was: %s'
+                                % (s, le,))
     return s
 
 def to_utf8(s):
@@ -357,7 +363,8 @@ def __init__(self, method=HTTP_METHOD, url=None, parameters=None,
     def url(self, value):
         self.__dict__['url'] = value
         if value is not None:
-            scheme, netloc, path, params, query, fragment = urlparse.urlparse(value)
+            scheme, netloc, path, params, query, fragment = urlparse.urlparse(
+                                                                value)
 
             # Exclude default port numbers.
             if scheme == 'http' and netloc[-3:] == ':80':
@@ -368,7 +375,8 @@ def url(self, value):
                 raise ValueError("Unsupported URL %s (%s)." % (value, scheme))
 
             # Normalized URL excludes params, query, and fragment.
-            self.normalized_url = urlparse.urlunparse((scheme, netloc, path, None, None, None))
+            self.normalized_url = urlparse.urlunparse(
+                                    (scheme, netloc, path, None, None, None))
         else:
             self.normalized_url = None
             self.__dict__['url'] = None
@@ -462,15 +470,19 @@ def get_normalized_parameters(self):
                     value = list(value)
                 except TypeError as e:
                     assert 'is not iterable' in str(e)
-                    items.append((to_utf8_if_string(key), to_utf8_if_string(value)))
+                    items.append(
+                        (to_utf8_if_string(key), to_utf8_if_string(value)))
                 else:
-                    items.extend((to_utf8_if_string(key), to_utf8_if_string(item)) for item in value)
+                    items.extend(
+                        (to_utf8_if_string(key), to_utf8_if_string(item))
+                            for item in value)
 
         # Include any query string parameters from the provided URL
         query = urlparse.urlparse(self.url)[4]
 
         url_items = self._split_url_string(query).items()
-        url_items = [(to_utf8(k), to_utf8(v)) for k, v in url_items if k != 'oauth_signature' ]
+        url_items = [(to_utf8(k), to_utf8(v))
+                        for k, v in url_items if k != 'oauth_signature' ]
         items.extend(url_items)
 
         items.sort()
@@ -486,7 +498,8 @@ def sign_request(self, signature_method, consumer, token):
 
         if not self.is_form_encoded:
             # according to
-            # http://oauth.googlecode.com/svn/spec/ext/body_hash/1.0/oauth-bodyhash.html
+            # http://oauth.googlecode.com/svn/spec/ext/body_hash/1.0/
+            #           oauth-bodyhash.html
             # section 4.1.1 "OAuth Consumers MUST NOT include an
             # oauth_body_hash parameter on requests with form-encoded
             # request bodies."
@@ -606,7 +619,8 @@ def _split_header(header):
     @staticmethod
     def _split_url_string(param_str):
         """Turn URL string into parameters."""
-        parameters = parse_qs(param_str.encode('utf-8'), keep_blank_values=True)
+        parameters = parse_qs(param_str.encode('utf-8'),
+                              keep_blank_values=True)
         for k, v in parameters.iteritems():
             parameters[k] = urllib.unquote(v[0])
         return parameters
@@ -628,7 +642,8 @@ def __init__(self, consumer, token=None, cache=None, timeout=None,
         self.token = token
         self.method = SignatureMethod_HMAC_SHA1()
 
-        httplib2.Http.__init__(self, cache=cache, timeout=timeout, proxy_info=proxy_info)
+        httplib2.Http.__init__(self, cache=cache, timeout=timeout,
+                               proxy_info=proxy_info)
 
     def set_signature_method(self, method):
         if not isinstance(method, SignatureMethod):
@@ -734,7 +749,9 @@ def _get_signature_method(self, request):
             return self.signature_methods[signature_method]
         except KeyError:
             signature_method_names = ', '.join(self.signature_methods.keys())
-            raise Error('Signature method %s not supported try one of the following: %s' % (signature_method, signature_method_names))
+            raise Error('Signature method %s not supported try one of the '
+                        'following: %s'
+                            % (signature_method, signature_method_names))
 
     def _check_signature(self, request, consumer, token):
         timestamp, nonce = request._get_timestamp_nonce()
@@ -805,7 +822,8 @@ class SignatureMethod_HMAC_SHA1(SignatureMethod):
     name = 'HMAC-SHA1'
 
     def signing_base(self, request, consumer, token):
-        if not hasattr(request, 'normalized_url') or request.normalized_url is None:
+        if (not hasattr(request, 'normalized_url') or
+            request.normalized_url is None):
             raise ValueError("Base URL for request is not set.")
 
         sig = (

setup.py

@@ -16,7 +16,8 @@
         mverstr = mo.group(1)
     else:
         print("unable to find version in %s" % (VERSIONFILE,))
-        raise RuntimeError("if %s.py exists, it must be well-formed" % (VERSIONFILE,))
+        raise RuntimeError("if %s.py exists, it must be well-formed"
+                                % (VERSIONFILE,))
     AVSRE = r"^auto_build_num *= *['\"]([^'\"]*)['\"]"
     mo = re.search(AVSRE, verstrline, re.M)
     if mo: