Merge pull request ojarva#51 from ojarva/yapf

Apply yapf

Author: ojarva

Diff for: .isort.cfg

@@ -1,3 +1,6 @@
 [settings]
-line_length = 120
+combine_as_imports = true
+force_alphabetical_sort = true
+line_length = 125
+no_sections = true
 not_skip = __init__.py

Diff for: .pylintrc

@@ -0,0 +1,5 @@
+[format]
+max-line-length=125
+
+[messages control]
+disable=line-too-long,missing-docstring,no-self-use,fixme,bad-indentation,bad-continuation,invalid-name,too-many-locals,duplicate-code,too-many-branches,wrong-import-order

Diff for: .style.yapf

@@ -0,0 +1,10 @@
+[style]
+based_on_style = pep8
+allow_split_before_dict_value = false
+blank_line_before_nested_class_or_def = false
+coalesce_brackets = true
+column_limit = 125
+dedent_closing_brackets = true
+each_dict_entry_on_separate_line = true
+join_multiple_lines = true
+spaces_around_power_operator = true

Diff for: .travis.yml

@@ -9,9 +9,11 @@ python:
   - "nightly"
 install:
   - pip install -r requirements.txt
-  - pip install pycodestyle isort pylint
+  - pip install pycodestyle isort pylint yapf
 script:
   - isort --diff --check --recursive sshpubkeys tests
   - pycodestyle --ignore E501,E402 --exclude=.git,dev3 sshpubkeys tests
-  - pylint sshpubkeys tests --disable line-too-long --disable missing-docstring --disable no-self-use --disable fixme --disable bad-indentation --disable bad-continuation --disable invalid-name --disable too-many-locals --disable duplicate-code --disable too-many-branches
+  - pylint sshpubkeys tests 
+  - isort --recursive sshpubkeys tests; yapf --recursive .
+  - git diff --exit-code  # This fails if isort&yapf combo made any changes
   - python setup.py test

Diff for: requirements.txt

@@ -1,2 +1,3 @@
-ecdsa==0.13
 cryptography==2.1.4
+ecdsa==0.13
+yapf==0.21.0

Diff for: setup.py

@@ -16,15 +16,12 @@
     author='Olli Jarva',
     author_email='[email protected]',
     license='BSD',
-
     classifiers=[
         'Development Status :: 4 - Beta',
-
         'Intended Audience :: Developers',
         'Intended Audience :: System Administrators',
         'Topic :: Security',
         'License :: OSI Approved :: BSD License',
-
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
@@ -37,8 +34,7 @@
     packages=["sshpubkeys"],
     test_suite="tests",
     install_requires=['cryptography>=2.1.4', 'ecdsa>=0.13'],
-
     extras_require={
-        'dev': ['twine', 'wheel'],
+        'dev': ['twine', 'wheel', 'yapf'],
     },
 )

Diff for: sshpubkeys/exceptions.py

@@ -1,5 +1,4 @@
 # pylint:disable=line-too-long,too-many-ancestors
-
 """Exceptions for sshpubkeys."""
 
 

Diff for: sshpubkeys/keys.py

@@ -1,5 +1,4 @@
 # pylint:disable=line-too-long
-
 """Parser for ssh public keys. Currently supports ssh-rsa, ssh-dsa, ssh-ed25519 and ssh-dss keys.
 
 import sys
@@ -14,23 +13,22 @@
     sys.exit(1)
 print(ssh_key.bits)"""
 
+from .exceptions import (InvalidKeyError, InvalidKeyLengthError, InvalidOptionNameError, InvalidOptionsError,
+                         InvalidTypeError, MalformedDataError, MissingMandatoryOptionValueError, TooLongKeyError,
+                         TooShortKeyError, UnknownOptionNameError)
+from cryptography.hazmat.backends import default_backend
+from cryptography.hazmat.primitives.asymmetric.dsa import DSAParameterNumbers, DSAPublicNumbers
+from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicNumbers
+
 import base64
 import binascii
+import ecdsa
 import hashlib
 import re
 import struct
 import sys
 import warnings
 
-import ecdsa
-from cryptography.hazmat.backends import default_backend
-from cryptography.hazmat.primitives.asymmetric.dsa import DSAParameterNumbers, DSAPublicNumbers
-from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicNumbers
-
-from .exceptions import (InvalidKeyError, InvalidKeyLengthError, InvalidOptionNameError, InvalidOptionsError,
-                         InvalidTypeError, MalformedDataError, MissingMandatoryOptionValueError, TooLongKeyError,
-                         TooShortKeyError, UnknownOptionNameError)
-
 __all__ = ["AuthorizedKeysFile", "SSHKey"]
 
 
@@ -180,7 +178,9 @@ def _unpack_by_int(self, data, current_position):
         remaining_data_length = len(data[current_position:])
 
         if remaining_data_length < requested_data_length:
-            raise MalformedDataError("Requested %s bytes, but only %s bytes available." % (requested_data_length, remaining_data_length))
+            raise MalformedDataError(
+                "Requested %s bytes, but only %s bytes available." % (requested_data_length, remaining_data_length)
+            )
 
         next_data = data[current_position:current_position + requested_data_length]
         # Move pointer to the end of the data field
@@ -312,9 +312,13 @@ def _process_ssh_rsa(self, data):
             min_length = self.RSA_MIN_LENGTH_LOOSE
             max_length = self.RSA_MAX_LENGTH_LOOSE
         if self.bits < min_length:
-            raise TooShortKeyError("%s key data can not be shorter than %s bits (was %s)" % (self.key_type, min_length, self.bits))
+            raise TooShortKeyError(
+                "%s key data can not be shorter than %s bits (was %s)" % (self.key_type, min_length, self.bits)
+            )
         if self.bits > max_length:
-            raise TooLongKeyError("%s key data can not be longer than %s bits (was %s)" % (self.key_type, max_length, self.bits))
+            raise TooLongKeyError(
+                "%s key data can not be longer than %s bits (was %s)" % (self.key_type, max_length, self.bits)
+            )
         return current_position
 
     def _process_ssh_dss(self, data):
@@ -338,7 +342,9 @@ def _process_ssh_dss(self, data):
         if p_bits < min_length:
             raise TooShortKeyError("%s key can not be shorter than %s bits (was %s)" % (self.key_type, min_length, p_bits))
         if p_bits > max_length:
-            raise TooLongKeyError("%s key data can not be longer than %s bits (was %s)" % (self.key_type, max_length, p_bits))
+            raise TooLongKeyError(
+                "%s key data can not be longer than %s bits (was %s)" % (self.key_type, max_length, p_bits)
+            )
 
         dsa_parameters = DSAParameterNumbers(data_fields["p"], data_fields["q"], data_fields["g"])
         self.dsa = DSAPublicNumbers(data_fields["y"], dsa_parameters).public_key(default_backend())

Diff for: tests/__init__.py

@@ -4,38 +4,34 @@
 
 """
 
-import sys
-import unittest
-
-from sshpubkeys import AuthorizedKeysFile, InvalidOptionsError, SSHKey
-
 from .authorized_keys import items as list_of_authorized_keys
 from .invalid_authorized_keys import items as list_of_invalid_authorized_keys
 from .invalid_keys import keys as list_of_invalid_keys
 from .invalid_options import options as list_of_invalid_options
 from .valid_keys import keys as list_of_valid_keys
 from .valid_keys_rfc4716 import keys as list_of_valid_keys_rfc4716
 from .valid_options import options as list_of_valid_options
+from sshpubkeys import AuthorizedKeysFile, InvalidOptionsError, SSHKey
+
+import sys
+import unittest
 
 if sys.version_info.major == 2:
     from io import BytesIO as StringIO
 else:
     from io import StringIO
 
-
 DEFAULT_KEY = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEGODBKRjsFB/1v3pDRGpA6xR+QpOJg9vat0brlbUNDD"
 
 
 class TestMisc(unittest.TestCase):
-
     def test_none_to_constructor(self):
         ssh = SSHKey(None)
         self.assertEqual(None, ssh.keydata)  # Python2.6 does not have assertIsNone
         self.assertRaises(ValueError, ssh.parse)
 
 
 class TestKeys(unittest.TestCase):
-
     def check_key(self, pubkey, bits, fingerprint_md5, fingerprint_sha256, options, comment, **kwargs):  # pylint:disable=too-many-arguments
         """ Checks valid key """
         ssh = SSHKey(pubkey, **kwargs)
@@ -55,7 +51,6 @@ def check_fail(self, pubkey, expected_error, **kwargs):
 
 
 class TestOptions(unittest.TestCase):
-
     def check_valid_option(self, option, parsed_option):
         ssh = SSHKey()
         parsed = ssh.parse_options(option)
@@ -72,7 +67,6 @@ def test_disallow_options(self):
 
 
 class TestAuthorizedKeys(unittest.TestCase):
-
     def check_valid_file(self, file_str, valid_keys_count):
         file_obj = StringIO(file_str)
         key_file = AuthorizedKeysFile(file_obj)
@@ -94,8 +88,10 @@ def test_disallow_options(self):
 
 def loop_options(options):
     """ Loop over list of options and dynamically create tests """
+
     def ch(option, parsed_option):
         return lambda self: self.check_valid_option(option, parsed_option)
+
     for i, items in enumerate(options):
         prefix_tmp = "%s_%s" % (items[0], i)
         setattr(TestOptions, "test_%s" % prefix_tmp, ch(items[1], items[2]))
@@ -104,15 +100,18 @@ def ch(option, parsed_option):
 def loop_invalid_options(options):
     def ch(option, expected_error):
         return lambda self: self.check_invalid_option(option, expected_error)
+
     for i, items in enumerate(options):
         prefix_tmp = "%s_%s" % (items[0], i)
         setattr(TestOptions, "test_%s" % prefix_tmp, ch(items[1], items[2]))
 
 
 def loop_valid(keyset, prefix):
     """ Loop over list of valid keys and dynamically create tests """
+
     def ch(pubkey, bits, fingerprint_md5, fingerprint_sha256, options, comment, **kwargs):  # pylint:disable=too-many-arguments
         return lambda self: self.check_key(pubkey, bits, fingerprint_md5, fingerprint_sha256, options, comment, **kwargs)
+
     for items in keyset:
         modes = items.pop()
         prefix_tmp = "%s_%s" % (prefix, items.pop())
@@ -126,13 +125,18 @@ def ch(pubkey, bits, fingerprint_md5, fingerprint_sha256, options, comment, **kw
                 options = comment = None
             else:
                 pubkey, bits, fingerprint_md5, fingerprint_sha256, options, comment = items
-            setattr(TestKeys, "test_%s_mode_%s" % (prefix_tmp, mode), ch(pubkey, bits, fingerprint_md5, fingerprint_sha256, options, comment, **kwargs))
+            setattr(
+                TestKeys, "test_%s_mode_%s" % (prefix_tmp, mode),
+                ch(pubkey, bits, fingerprint_md5, fingerprint_sha256, options, comment, **kwargs)
+            )
 
 
 def loop_invalid(keyset, prefix):
     """ Loop over list of invalid keys and dynamically create tests """
+
     def ch(pubkey, expected_error, **kwargs):
         return lambda self: self.check_fail(pubkey, expected_error, **kwargs)
+
     for items in keyset:
         modes = items.pop()
         prefix_tmp = "%s_%s" % (prefix, items.pop())
@@ -148,6 +152,7 @@ def ch(pubkey, expected_error, **kwargs):
 def loop_authorized_keys(keyset):
     def ch(file_str, valid_keys_count):
         return lambda self: self.check_valid_file(file_str, valid_keys_count)
+
     for i, items in enumerate(keyset):
         prefix_tmp = "%s_%s" % (items[0], i)
         setattr(TestAuthorizedKeys, "test_%s" % prefix_tmp, ch(items[1], items[2]))
@@ -156,6 +161,7 @@ def ch(file_str, valid_keys_count):
 def loop_invalid_authorized_keys(keyset):
     def ch(file_str, expected_error, **kwargs):
         return lambda self: self.check_invalid_file(file_str, expected_error, **kwargs)
+
     for i, items in enumerate(keyset):
         prefix_tmp = "%s_%s" % (items[0], i)
         setattr(TestAuthorizedKeys, "test_invalid_%s" % prefix_tmp, ch(items[1], items[2]))

Diff for: tests/invalid_authorized_keys.py

@@ -1,8 +1,6 @@
-from sshpubkeys.exceptions import InvalidKeyError, MalformedDataError
-
+from .invalid_keys import keys as invalid_keys
 from .valid_keys import keys as valid_keys
-
-from.invalid_keys import keys as invalid_keys
+from sshpubkeys.exceptions import InvalidKeyError, MalformedDataError
 
 items = [
     ["lines_with_spaces", " # Comments\n  \n" + valid_keys[0][0] + "\nasdf", InvalidKeyError],