More PEP8 cleanup.

Author: ahknight

.gitignore

@@ -11,3 +11,5 @@ doc/__build/*
 *_rsa.pub
 locale/
 pip-log.txt
+/.idea
+/.eggs

README.rst

@@ -34,7 +34,7 @@ For testing:
 
 * tox
 * pyenv (optional, handy way to access multiple versions)
-	$ for VERS in 2.7.14 3.3.7 3.4.8 3.5.5 3.6.4; do pyenv install -s $VERS; done
+    $ for VERS in 2.7.14 3.3.7 3.4.8 3.5.5 3.6.4; do pyenv install -s $VERS; done
 
 Usage
 -----

httpsig/__init__.py

@@ -4,3 +4,5 @@
 from ._version import get_versions
 __version__ = get_versions()['version']
 del get_versions
+
+__all__ = (Signer, HeaderSigner, Verifier, HeaderVerifier)

httpsig/_version.py

@@ -132,7 +132,7 @@ def versions_from_vcs(tag_prefix, root, verbose=False):
         return {}
     if not stdout.startswith(tag_prefix):
         if verbose:
-            print("tag '%s' doesn't start with prefix '%s'" % (stdout, tag_prefix))
+            print("tag '%s' doesn't start with prefix '%s'" % (stdout, tag_prefix))  # noqa: E501
         return {}
     tag = stdout[len(tag_prefix):]
     stdout = run_command(GITS, ["rev-parse", "HEAD"], cwd=root)
@@ -150,7 +150,7 @@ def versions_from_parentdir(parentdir_prefix, root, verbose=False):
     dirname = os.path.basename(root)
     if not dirname.startswith(parentdir_prefix):
         if verbose:
-            print("guessing rootdir is '%s', but '%s' doesn't start with prefix '%s'" %
+            print("guessing rootdir is '%s', but '%s' doesn't start with prefix '%s'" %   # noqa: E501
                   (root, dirname, parentdir_prefix))
         return None
     return {"version": dirname[len(parentdir_prefix):], "full": ""}

httpsig/requests_auth.py

@@ -10,7 +10,7 @@
 
 
 class HTTPSignatureAuth(requests.auth.AuthBase):
-    '''
+    """
     Sign a request using the http-signature scheme.
     https://github.com/joyent/node-http-signature/blob/master/http_signing.md
 
@@ -20,7 +20,7 @@ class HTTPSignatureAuth(requests.auth.AuthBase):
     `algorithm` is one of the six specified algorithms
       headers is a list of http headers to be included in the signing string,
       defaulting to "Date" alone.
-    '''
+    """
     def __init__(self, key_id='', secret='', algorithm=None, headers=None):
         headers = headers or []
         self.header_signer = HeaderSigner(

httpsig/sign.py

@@ -74,7 +74,7 @@ def _sign(self, data):
 
 
 class HeaderSigner(Signer):
-    '''
+    """
     Generic object that will sign headers as a dictionary using the
         http-signature scheme.
     https://github.com/joyent/node-http-signature/blob/master/http_signing.md
@@ -86,7 +86,7 @@ class HeaderSigner(Signer):
     :arg algorithm: one of the six specified algorithms
     :arg headers:   a list of http headers to be included in the signing
         string, defaulting to ['date'].
-    '''
+    """
     def __init__(self, key_id, secret, algorithm=None, headers=None):
         if algorithm is None:
             algorithm = DEFAULT_SIGN_ALGORITHM

httpsig/tests/test_signature.py

@@ -44,7 +44,7 @@ def test_default(self):
         self.assertIn('signature', params)
         self.assertEqual(params['keyId'], 'Test')
         self.assertEqual(params['algorithm'], 'rsa-sha256')
-        self.assertEqual(params['signature'], 'jKyvPcxB4JbmYY4mByyBY7cZfNl4OW9HpFQlG7N4YcJPteKTu4MWCLyk+gIr0wDgqtLWf9NLpMAMimdfsH7FSWGfbMFSrsVTHNTk0rK3usrfFnti1dxsM4jl0kYJCKTGI/UWkqiaxwNiKqGcdlEDrTcUhhsFsOIo8VhddmZTZ8w=')
+        self.assertEqual(params['signature'], 'jKyvPcxB4JbmYY4mByyBY7cZfNl4OW9HpFQlG7N4YcJPteKTu4MWCLyk+gIr0wDgqtLWf9NLpMAMimdfsH7FSWGfbMFSrsVTHNTk0rK3usrfFnti1dxsM4jl0kYJCKTGI/UWkqiaxwNiKqGcdlEDrTcUhhsFsOIo8VhddmZTZ8w=')  # noqa: E501
 
     def test_basic(self):
         hs = sign.HeaderSigner(key_id='Test', secret=self.key, headers=[
@@ -71,7 +71,7 @@ def test_basic(self):
         self.assertEqual(params['algorithm'], 'rsa-sha256')
         self.assertEqual(
             params['headers'], '(request-target) host date')
-        self.assertEqual(params['signature'], 'HUxc9BS3P/kPhSmJo+0pQ4IsCo007vkv6bUm4Qehrx+B1Eo4Mq5/6KylET72ZpMUS80XvjlOPjKzxfeTQj4DiKbAzwJAb4HX3qX6obQTa00/qPDXlMepD2JtTw33yNnm/0xV7fQuvILN/ys+378Ysi082+4xBQFwvhNvSoVsGv4=')
+        self.assertEqual(params['signature'], 'HUxc9BS3P/kPhSmJo+0pQ4IsCo007vkv6bUm4Qehrx+B1Eo4Mq5/6KylET72ZpMUS80XvjlOPjKzxfeTQj4DiKbAzwJAb4HX3qX6obQTa00/qPDXlMepD2JtTw33yNnm/0xV7fQuvILN/ys+378Ysi082+4xBQFwvhNvSoVsGv4=')  # noqa: E501
 
     def test_all(self):
         hs = sign.HeaderSigner(key_id='Test', secret=self.key, headers=[
@@ -105,4 +105,4 @@ def test_all(self):
         self.assertEqual(
             params['headers'],
             '(request-target) host date content-type digest content-length')
-        self.assertEqual(params['signature'], 'Ef7MlxLXoBovhil3AlyjtBwAL9g4TN3tibLj7uuNB3CROat/9KaeQ4hW2NiJ+pZ6HQEOx9vYZAyi+7cmIkmJszJCut5kQLAwuX+Ms/mUFvpKlSo9StS2bMXDBNjOh4Auj774GFj4gwjS+3NhFeoqyr/MuN6HsEnkvn6zdgfE2i0=')
+        self.assertEqual(params['signature'], 'Ef7MlxLXoBovhil3AlyjtBwAL9g4TN3tibLj7uuNB3CROat/9KaeQ4hW2NiJ+pZ6HQEOx9vYZAyi+7cmIkmJszJCut5kQLAwuX+Ms/mUFvpKlSo9StS2bMXDBNjOh4Auj774GFj4gwjS+3NhFeoqyr/MuN6HsEnkvn6zdgfE2i0=')  # noqa: E501

httpsig/tests/test_verify.py

@@ -6,10 +6,12 @@
 from httpsig.sign import HeaderSigner, Signer
 from httpsig.verify import HeaderVerifier, Verifier
 
+
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
 
 
 class BaseTestCase(unittest.TestCase):
+
     def _parse_auth(self, auth):
         """Basic Authorization header parsing."""
         # split 'Signature kvpairs'
@@ -43,7 +45,8 @@ def setUp(self):
 
     def test_basic_sign(self):
         signer = Signer(secret=self.sign_secret, algorithm=self.algorithm)
-        verifier = Verifier(secret=self.verify_secret, algorithm=self.algorithm)
+        verifier = Verifier(
+                secret=self.verify_secret, algorithm=self.algorithm)
 
         GOOD = b"this is a test"
         BAD = b"this is not the signature you were looking for..."
@@ -58,7 +61,8 @@ def test_default(self):
             'Date': self.header_date
         }
 
-        hs = HeaderSigner(key_id="Test", secret=self.sign_secret, algorithm=self.algorithm)
+        hs = HeaderSigner(
+            key_id="Test", secret=self.sign_secret, algorithm=self.algorithm)
         signed = hs.sign(unsigned)
         hv = HeaderVerifier(headers=signed, secret=self.verify_secret)
         self.assertTrue(hv.verify())
@@ -67,14 +71,18 @@ def test_signed_headers(self):
         HOST = self.header_host
         METHOD = self.test_method
         PATH = self.test_path
-        hs = HeaderSigner(key_id="Test", secret=self.sign_secret, algorithm=self.algorithm, headers=[
-            '(request-target)',
-            'host',
-            'date',
-            'content-type',
-            'digest',
-            'content-length'
-        ])
+        hs = HeaderSigner(
+                key_id="Test",
+                secret=self.sign_secret,
+                algorithm=self.algorithm,
+                headers=[
+                    '(request-target)',
+                    'host',
+                    'date',
+                    'content-type',
+                    'digest',
+                    'content-length'
+                ])
         unsigned = {
             'Host': HOST,
             'Date': self.header_date,
@@ -84,7 +92,9 @@ def test_signed_headers(self):
         }
         signed = hs.sign(unsigned, method=METHOD, path=PATH)
 
-        hv = HeaderVerifier(headers=signed, secret=self.verify_secret, host=HOST, method=METHOD, path=PATH)
+        hv = HeaderVerifier(
+                headers=signed, secret=self.verify_secret,
+                host=HOST, method=METHOD, path=PATH)
         self.assertTrue(hv.verify())
 
     def test_incorrect_headers(self):
@@ -110,23 +120,27 @@ def test_incorrect_headers(self):
         }
         signed = hs.sign(unsigned, method=METHOD, path=PATH)
 
-        hv = HeaderVerifier(headers=signed, secret=self.verify_secret, required_headers=["some-other-header"],
+        hv = HeaderVerifier(headers=signed, secret=self.verify_secret,
+                            required_headers=["some-other-header"],
                             host=HOST, method=METHOD, path=PATH)
-        with self.assertRaises(Exception) as ex:
+        with self.assertRaises(Exception):
             hv.verify()
 
     def test_extra_auth_headers(self):
         HOST = "example.com"
         METHOD = "POST"
         PATH = '/foo?param=value&pet=dog'
-        hs = HeaderSigner(key_id="Test", secret=self.sign_secret, algorithm=self.algorithm, headers=[
-            '(request-target)',
-            'host',
-            'date',
-            'content-type',
-            'digest',
-            'content-length'
-        ])
+        hs = HeaderSigner(
+                key_id="Test",
+                secret=self.sign_secret,
+                algorithm=self.algorithm, headers=[
+                    '(request-target)',
+                    'host',
+                    'date',
+                    'content-type',
+                    'digest',
+                    'content-length'
+                ])
         unsigned = {
             'Host': HOST,
             'Date': self.header_date,
@@ -135,30 +149,41 @@ def test_extra_auth_headers(self):
             'Content-Length': self.header_content_length,
         }
         signed = hs.sign(unsigned, method=METHOD, path=PATH)
-        hv = HeaderVerifier(headers=signed, secret=self.verify_secret, method=METHOD, path=PATH,
-                            required_headers=['date', '(request-target)'])
+        hv = HeaderVerifier(
+                headers=signed,
+                secret=self.verify_secret,
+                method=METHOD,
+                path=PATH,
+                required_headers=['date', '(request-target)'])
         self.assertTrue(hv.verify())
 
 
 class TestVerifyHMACSHA256(TestVerifyHMACSHA1):
+
     def setUp(self):
         super(TestVerifyHMACSHA256, self).setUp()
         self.algorithm = "hmac-sha256"
 
 
 class TestVerifyHMACSHA512(TestVerifyHMACSHA1):
+
     def setUp(self):
         super(TestVerifyHMACSHA512, self).setUp()
         self.algorithm = "hmac-sha512"
 
 
 class TestVerifyRSASHA1(TestVerifyHMACSHA1):
+
     def setUp(self):
-        private_key_path = os.path.join(os.path.dirname(__file__), 'rsa_private.pem')
+        private_key_path = os.path.join(
+                            os.path.dirname(__file__),
+                            'rsa_private.pem')
         with open(private_key_path, 'rb') as f:
             private_key = f.read()
 
-        public_key_path = os.path.join(os.path.dirname(__file__), 'rsa_public.pem')
+        public_key_path = os.path.join(
+                            os.path.dirname(__file__),
+                            'rsa_public.pem')
         with open(public_key_path, 'rb') as f:
             public_key = f.read()
 
@@ -169,12 +194,14 @@ def setUp(self):
 
 
 class TestVerifyRSASHA256(TestVerifyRSASHA1):
+
     def setUp(self):
         super(TestVerifyRSASHA256, self).setUp()
         self.algorithm = "rsa-sha256"
 
 
 class TestVerifyRSASHA512(TestVerifyRSASHA1):
+
     def setUp(self):
         super(TestVerifyRSASHA512, self).setUp()
         self.algorithm = "rsa-sha512"

httpsig/utils.py

@@ -1,8 +1,8 @@
+import base64
+import six
 import re
 import struct
 import hashlib
-import base64
-import six
 
 try:
     # Python 3
@@ -11,7 +11,6 @@
     # Python 2
     from urllib2 import parse_http_list
 
-from Crypto.PublicKey import RSA
 from Crypto.Hash import SHA, SHA256, SHA512
 
 ALGORITHMS = frozenset([
@@ -65,7 +64,8 @@ def generate_message(required_headers, headers, host=None, method=None,
         h = h.lower()
         if h == '(request-target)':
             if not method or not path:
-                raise Exception('method and path arguments required when using "(request-target)"')
+                raise Exception('method and path arguments required when ' +
+                                'using "(request-target)"')
             signable_list.append('%s: %s %s' % (h, method.lower(), path))
 
         elif h == 'host':
@@ -76,11 +76,11 @@ def generate_message(required_headers, headers, host=None, method=None,
                 if 'host' in headers:
                     host = headers[h]
                 else:
-                    raise Exception('missing required header "%s"' % (h))
+                    raise Exception('missing required header "%s"' % h)
             signable_list.append('%s: %s' % (h, host))
         else:
             if h not in headers:
-                raise Exception('missing required header "%s"' % (h))
+                raise Exception('missing required header "%s"' % h)
 
             signable_list.append('%s: %s' % (h, headers[h]))
 
@@ -94,7 +94,8 @@ def parse_authorization_header(header):
 
     auth = header.split(" ", 1)
     if len(auth) > 2:
-        raise ValueError('Invalid authorization header. (eg. Method key1=value1,key2="value, \"2\"")')
+        raise ValueError('Invalid authorization header. (eg. Method ' +
+                         'key1=value1,key2="value, \"2\"")')
 
     # Split up any args into a dictionary.
     values = {}
@@ -148,10 +149,10 @@ def build_signature_template(key_id, algorithm, headers):
 def lkv(d):
     parts = []
     while d:
-            len = struct.unpack('>I', d[:4])[0]
-            bits = d[4:len+4]
+            length = struct.unpack('>I', d[:4])[0]
+            bits = d[4:length+4]
             parts.append(bits)
-            d = d[len+4:]
+            d = d[length+4:]
     return parts