Merge branch 'imports'

Changes for importing and flake8.

Author: frozencemetery

gssapi/__init__.py

@@ -0,0 +1,7 @@
+from gssapi.raw.types import NameType, RequirementFlag, AddressType  # noqa
+from gssapi.raw.types import MechType, IntEnumFlagSet  # noqa
+from gssapi.raw.oids import OID  # noqa
+
+from gssapi.creds import Credentials  # noqa
+from gssapi.names import Name  # noqa
+from gssapi.sec_contexts import SecurityContext  # noqa

gssapi/exceptions.py

@@ -1,3 +1,7 @@
+from gssapi.raw.exceptions import *  # noqa
+from gssapi.raw.misc import GSSError  # noqa
+
+
 # non-GSS exceptions
 class GeneralError(Exception):
     MAJOR_MESSAGE = "General error"

setup.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
-from setuptools import setup, Feature
+from setuptools import setup, Feature  # noqa
 from setuptools.extension import Extension
 from Cython.Distutils import build_ext
-import sys
+import sys  # noqa
 import re
 import os
 
@@ -13,6 +13,7 @@
     get_output = commands.getoutput
 except ImportError:
     import subprocess
+
     def _get_output(*args, **kwargs):
         res = subprocess.check_output(*args, shell=True, **kwargs)
         decoded = res.decode('utf-8')
@@ -33,7 +34,8 @@ def _get_output(*args, **kwargs):
 link_args = link_args.split()
 compile_args = compile_args.split()
 
-ENABLE_SUPPORT_DETECTION = (os.environ.get('GSSAPI_SUPPORT_DETECT', 'true').lower() == 'true')
+ENABLE_SUPPORT_DETECTION = \
+    (os.environ.get('GSSAPI_SUPPORT_DETECT', 'true').lower() == 'true')
 
 if ENABLE_SUPPORT_DETECTION:
     main_lib = os.environ.get('GSSAPI_MAIN_LIB', None)
@@ -70,26 +72,29 @@ def run(self):
                         header.write('#include "gssapi.h"')
 
                 for ext in self.extensions:
-                    ext.extra_compile_args.append("-I%s" % os.path.abspath(target_dir))
+                    ext.extra_compile_args.append("-I%s" %
+                                                  os.path.abspath(target_dir))
 
         build_ext.run(self)
 
-# detect support
 
+# detect support
 def main_file(module):
     return Extension('gssapi.raw.%s' % module,
-                     extra_link_args = link_args,
-                     extra_compile_args = compile_args,
-                     sources = ['gssapi/raw/%s.pyx' % module])
+                     extra_link_args=link_args,
+                     extra_compile_args=compile_args,
+                     sources=['gssapi/raw/%s.pyx' % module])
+
 
 def extension_file(module, canary):
     if ENABLE_SUPPORT_DETECTION and not hasattr(GSSAPI_LIB, canary):
         return None
     else:
         return Extension('gssapi.raw.ext_%s' % module,
-                         extra_link_args = link_args,
-                         extra_compile_args = compile_args,
-                         sources = ['gssapi/raw/ext_%s.pyx' % module])
+                         extra_link_args=link_args,
+                         extra_compile_args=compile_args,
+                         sources=['gssapi/raw/ext_%s.pyx' % module])
+
 
 def gssapi_modules(lst):
     # filter out missing files
@@ -99,9 +104,9 @@ def gssapi_modules(lst):
     MECHS_SUPPORTED = os.environ.get('GSSAPI_MECHS', 'krb5').split(',')
     for mech in MECHS_SUPPORTED:
         res.append(Extension('gssapi.raw.mech_%s' % mech,
-                             extra_link_args = link_args,
-                             extra_compile_args = compile_args,
-                             sources = ['gssapi/raw/mech_%s.pyx' % mech]))
+                             extra_link_args=link_args,
+                             extra_compile_args=compile_args,
+                             sources=['gssapi/raw/mech_%s.pyx' % mech]))
 
     return res
 
@@ -132,8 +137,8 @@ def gssapi_modules(lst):
         'Topic :: Security',
         'Topic :: Software Development :: Libraries :: Python Modules'
     ],
-    cmdclass = {'build_ext': build_gssapi_ext},
-    ext_modules = gssapi_modules([
+    cmdclass={'build_ext': build_gssapi_ext},
+    ext_modules=gssapi_modules([
         main_file('misc'),
         main_file('exceptions'),
         main_file('creds'),

tox.ini

@@ -9,6 +9,7 @@ envlist = py27,py33
 [testenv]
 # NB(sross): disabling E225,E226,E227,E901 make pep8 think Cython is ok
 commands =
+    flake8 setup.py
     flake8 gssapi
     flake8 gssapi --filename='*.pyx,*.pxd' --ignore=E225,E226,E227,E901
     python setup.py nosetests []