Merge "Switch from pep8 to flake8 for linting"

6 files changed, 33 insertions, 15 deletions

diff --git a/pyeclib/core.py b/pyeclib/core.py
index c7e38df..11e29e3 100644
--- a/pyeclib/core.py
+++ b/pyeclib/core.py
@@ -49,8 +49,6 @@ class ECPyECLibDriver(object):
         if self.chksum_type is PyECLib_FRAGHDRCHKSUM_Types.inline_crc32:
             self.inline_chksum = 1
 
-        name = self.ec_type.name
-
         self.handle = pyeclib_c.init(
             self.k,
             self.m,
diff --git a/pyeclib/ec_iface.py b/pyeclib/ec_iface.py
index 43f0e61..a924dc3 100644
--- a/pyeclib/ec_iface.py
+++ b/pyeclib/ec_iface.py
@@ -57,7 +57,7 @@ def check_backend_available(backend_name):
         else:
             k, m = (10, 4)
         try:
-            driver = ECDriver(ec_type=backend_name, k=k, m=m)
+            ECDriver(ec_type=backend_name, k=k, m=m)
         except ECDriverError:
             return False
         return True
@@ -66,6 +66,7 @@ def check_backend_available(backend_name):
 def PyECLibVersion(z, y, x):
     return (((z) << 16) + ((y) << 8) + (x))
 
+
 PYECLIB_MAJOR = 1
 PYECLIB_MINOR = 1
 PYECLIB_REV = 2
@@ -575,4 +576,5 @@ def _liberasurecode_version():
             'this message' % version_str)
     return version_str
 
+
 LIBERASURECODE_VERSION = _liberasurecode_version()
diff --git a/pyeclib/enum.py b/pyeclib/enum.py
index d0c858d..cba9898 100644
--- a/pyeclib/enum.py
+++ b/pyeclib/enum.py
@@ -647,6 +647,8 @@ def __new__(cls, value):
             if member.value == value:
                 return member
     raise ValueError("%s is not a valid %s" % (value, cls.__name__))
+
+
 temp_enum_dict['__new__'] = __new__
 del __new__
 
@@ -654,12 +656,16 @@ del __new__
 def __repr__(self):
     return "<%s.%s: %r>" % (
         self.__class__.__name__, self._name_, self._value_)
+
+
 temp_enum_dict['__repr__'] = __repr__
 del __repr__
 
 
 def __str__(self):
     return "%s.%s" % (self.__class__.__name__, self._name_)
+
+
 temp_enum_dict['__str__'] = __str__
 del __str__
 
@@ -668,6 +674,8 @@ def __dir__(self):
     added_behavior = [m for m in self.__class__.__dict__ if m[0] != '_']
     return (['__class__', '__doc__', '__module__', 'name', 'value'] +
             added_behavior)
+
+
 temp_enum_dict['__dir__'] = __dir__
 del __dir__
 
@@ -686,6 +694,8 @@ def __format__(self, format_spec):
         cls = self._member_type_
         val = self.value
     return cls.__format__(val, format_spec)
+
+
 temp_enum_dict['__format__'] = __format__
 del __format__
 
@@ -737,6 +747,8 @@ def __eq__(self, other):
     if type(other) is self.__class__:
         return self is other
     return NotImplemented
+
+
 temp_enum_dict['__eq__'] = __eq__
 del __eq__
 
@@ -745,18 +757,24 @@ def __ne__(self, other):
     if type(other) is self.__class__:
         return self is not other
     return NotImplemented
+
+
 temp_enum_dict['__ne__'] = __ne__
 del __ne__
 
 
 def __hash__(self):
     return hash(self._name_)
+
+
 temp_enum_dict['__hash__'] = __hash__
 del __hash__
 
 
 def __reduce_ex__(self, proto):
     return self.__class__, (self._value_, )
+
+
 temp_enum_dict['__reduce_ex__'] = __reduce_ex__
 del __reduce_ex__
 
@@ -771,6 +789,8 @@ del __reduce_ex__
 @_RouteClassAttributeToGetattr
 def name(self):
     return self._name_
+
+
 temp_enum_dict['name'] = name
 del name
 
@@ -778,6 +798,8 @@ del name
 @_RouteClassAttributeToGetattr
 def value(self):
     return self._value_
+
+
 temp_enum_dict['value'] = value
 del value
 
diff --git a/setup.py b/setup.py
index 4482491..9a064f9 100644
--- a/setup.py
+++ b/setup.py
@@ -28,12 +28,9 @@ import os
 import platform
 import sys
 
-from ctypes import *
-from ctypes.util import *
+from ctypes.util import find_library
 from distutils.command.build import build as _build
 from distutils.command.clean import clean as _clean
-from distutils.sysconfig import EXEC_PREFIX as _exec_prefix
-from distutils.sysconfig import get_python_lib
 from distutils.sysconfig import get_python_inc
 
 try:
@@ -83,7 +80,6 @@ class build(_build):
     def check_liberasure(self):
         library_basename = "liberasurecode"
         library_version = "1"
-        library = library_basename + "-" + library_version
         library_url = "https://github.com/openstack/liberasurecode"
 
         found_path = _find_library("erasurecode")
@@ -205,6 +201,6 @@ setup(name='pyeclib',
       cmdclass={'build': build, 'install': install, 'clean': clean},
       py_modules=['pyeclib.ec_iface', 'pyeclib.core'],
       command_options={
-        'build_sphinx': {
-            'build_dir': ('setup.py', 'doc/build')}},
+          'build_sphinx': {
+              'build_dir': ('setup.py', 'doc/build')}},
       test_suite='test')
diff --git a/test/test_pyeclib_api.py b/test/test_pyeclib_api.py
index fb9c04d..4903f73 100644
--- a/test/test_pyeclib_api.py
+++ b/test/test_pyeclib_api.py
@@ -184,11 +184,11 @@ class TestPyECLibDriver(unittest.TestCase):
                 continue
             try:
                 if _type is 'shss':
-                    _instance = ECDriver(k=10, m=4, ec_type=_type)
+                    ECDriver(k=10, m=4, ec_type=_type)
                 elif _type is 'libphazr':
-                    _instance = ECDriver(k=4, m=4, ec_type=_type)
+                    ECDriver(k=4, m=4, ec_type=_type)
                 else:
-                    _instance = ECDriver(k=10, m=5, ec_type=_type)
+                    ECDriver(k=10, m=5, ec_type=_type)
             except ECDriverError:
                 self.fail("%s algorithm not supported" % _type)
 
diff --git a/tox.ini b/tox.ini
index b1b6e14..d5b2414 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,9 +19,9 @@ install_command =
 [testenv:pep8]
 skip_install = True
 deps=
-    pep8
+    flake8
 commands=
-    pep8 pyeclib/ setup.py test/
+    flake8 pyeclib/ setup.py test/
 
 [testenv:venv]
 commands = {posargs}