flake8 clean and use pytest parametrize

Author: RonnyPfannschmidt

.hgignore

@@ -13,4 +13,5 @@ syntax:glob
 build
 dist
 apipkg.egg-info
-
+.cache/
+.eggs/

apipkg.py

@@ -11,6 +11,7 @@
 
 __version__ = '1.3.dev'
 
+
 def _py_abspath(path):
     """
     special version of abspath
@@ -22,6 +23,7 @@ def _py_abspath(path):
     else:
         return os.path.abspath(path)
 
+
 def initpkg(pkgname, exportdefs, attr=dict()):
     """ initialize given package from the export definitions. """
     oldmod = sys.modules.get(pkgname)
@@ -44,6 +46,7 @@ def initpkg(pkgname, exportdefs, attr=dict()):
     mod = ApiModule(pkgname, exportdefs, implprefix=pkgname, attr=d)
     sys.modules[pkgname] = mod
 
+
 def importobj(modpath, attrname):
     module = __import__(modpath, None, None, ['__doc__'])
     if not attrname:
@@ -55,13 +58,15 @@ def importobj(modpath, attrname):
         retval = getattr(retval, x)
     return retval
 
+
 class ApiModule(ModuleType):
     def __docget(self):
         try:
             return self.__doc
         except AttributeError:
             if '__doc__' in self.__map__:
                 return self.__makeattr('__doc__')
+
     def __docset(self, value):
         self.__doc = value
     __doc__ = property(__docget, __docset)
@@ -132,8 +137,10 @@ def __makeattr(self, name):
 
     __getattr__ = __makeattr
 
+    @property
     def __dict__(self):
-        # force all the content of the module to be loaded when __dict__ is read
+        # force all the content of the module
+        # to be loaded when __dict__ is read
         dictdescr = ModuleType.__dict__['__dict__']
         dict = dictdescr.__get__(self)
         if dict is not None:
@@ -144,7 +151,6 @@ def __dict__(self):
                 except AttributeError:
                     pass
         return dict
-    __dict__ = property(__dict__)
 
 
 def AliasModule(modname, modpath, attrname=None):

conftest.py

@@ -6,20 +6,15 @@
 (c) 2009 holger krekel, Holger Krekel
 """
 
-import os, sys
+from setuptools import setup
 
-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
 
 def main():
     setup(
         name='apipkg',
-        description=
-        'apipkg: namespace control and lazy-import mechanism',
-        long_description = open('README.txt').read(),
-        version='1.3.dev',
+        description='apipkg: namespace control and lazy-import mechanism',
+        long_description=open('README.txt').read(),
+        get_version_from_scm=True,
         url='http://bitbucket.org/hpk42/apipkg',
         license='MIT License',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
@@ -34,8 +29,11 @@ def main():
             'Operating System :: MacOS :: MacOS X',
             'Topic :: Software Development :: Libraries',
             'Programming Language :: Python'],
-        py_modules=['apipkg']
+        py_modules=['apipkg'],
+        setup_requires=[
+            'hgdistver'
+        ]
     )
 
 if __name__ == '__main__':
-    main()
+    main()

setup.py

@@ -3,10 +3,12 @@
 import py
 import apipkg
 import subprocess
+import pytest
 #
 # test support for importing modules
 #
-ModuleType = py.std.types.ModuleType
+ModuleType = types.ModuleType
+
 
 class TestRealModule:
 
@@ -61,7 +63,7 @@ def test_realmodule(self):
 
     def test_realmodule_repr(self):
         import realtest.x
-        assert "<ApiModule 'realtest.x'>"  == repr(realtest.x)
+        assert "<ApiModule 'realtest.x'>" == repr(realtest.x)
 
     def test_realmodule_from(self):
         from realtest.x import module
@@ -86,6 +88,7 @@ def test_realmodule___doc__(self):
         print (realtest.x.module.__map__)
         assert realtest.x.module.__doc__ == 'test module'
 
+
 class TestScenarios:
     def test_relative_import(self, monkeypatch, tmpdir):
         pkgdir = tmpdir.mkdir("mymodule")
@@ -150,9 +153,9 @@ def test_from_module_alias_import(self, monkeypatch, tmpdir):
         from fromaliasimport.some import join
         assert join is py.std.os.path.join
 
+
 def xtest_nested_absolute_imports():
-    import email
-    api_email = apipkg.ApiModule('email',{
+    apipkg.ApiModule('email', {
         'message2': {
             'Message': 'email.message:Message',
             },
@@ -162,6 +165,8 @@ def xtest_nested_absolute_imports():
 
 # alternate ideas for specifying package + preliminary code
 #
+
+
 def test_parsenamespace():
     spec = """
         path.local    __.path.local::LocalPath
@@ -170,10 +175,14 @@ def test_parsenamespace():
     """
     d = parsenamespace(spec)
     print (d)
-    assert d == {'test': {'raises': '__.test.outcome::raises'},
-                 'path': {'svnwc': '__.path.svnwc::WCCommandPath',
-                          'local': '__.path.local::LocalPath'}
-            }
+    assert d == {
+        'test': {'raises': '__.test.outcome::raises'},
+        'path': {
+            'svnwc': '__.path.svnwc::WCCommandPath',
+            'local': '__.path.local::LocalPath'}
+    }
+
+
 def xtest_parsenamespace_errors():
     py.test.raises(ValueError, """
         parsenamespace('path.local xyz')
@@ -182,6 +191,7 @@ def xtest_parsenamespace_errors():
         parsenamespace('x y z')
     """)
 
+
 def parsenamespace(spec):
     ns = {}
     for line in spec.split("\n"):
@@ -190,10 +200,10 @@ def parsenamespace(spec):
             continue
         parts = [x.strip() for x in line.split()]
         if len(parts) != 2:
-            raise ValueError("Wrong format: %r" %(line,))
+            raise ValueError("Wrong format: %r" % (line,))
         apiname, spec = parts
         if not spec.startswith("__"):
-            raise ValueError("%r does not start with __" %(spec,))
+            raise ValueError("%r does not start with __" % (spec,))
         apinames = apiname.split(".")
         cur = ns
         for name in apinames[:-1]:
@@ -202,6 +212,7 @@ def parsenamespace(spec):
         cur[apinames[-1]] = spec
     return ns
 
+
 def test_initpkg_replaces_sysmodules(monkeypatch):
     mod = ModuleType('hello')
     monkeypatch.setitem(sys.modules, 'hello', mod)
@@ -210,6 +221,7 @@ def test_initpkg_replaces_sysmodules(monkeypatch):
     assert newmod != mod
     assert newmod.x == py.std.os.path.abspath
 
+
 def test_initpkg_transfers_attrs(monkeypatch):
     mod = ModuleType('hello')
     mod.__version__ = 10
@@ -225,6 +237,7 @@ def test_initpkg_transfers_attrs(monkeypatch):
     assert newmod.__loader__ == mod.__loader__
     assert newmod.__doc__ == mod.__doc__
 
+
 def test_initpkg_nodoc(monkeypatch):
     mod = ModuleType('hello')
     mod.__file__ = "hello.py"
@@ -233,6 +246,7 @@ def test_initpkg_nodoc(monkeypatch):
     newmod = sys.modules['hello']
     assert not newmod.__doc__
 
+
 def test_initpkg_overwrite_doc(monkeypatch):
     hello = ModuleType('hello')
     hello.__doc__ = "this is the documentation"
@@ -242,6 +256,7 @@ def test_initpkg_overwrite_doc(monkeypatch):
     assert newhello != hello
     assert newhello.__doc__ == sys.__doc__
 
+
 def test_initpkg_not_transfers_not_existing_attrs(monkeypatch):
     mod = ModuleType('hello')
     mod.__file__ = "hello.py"
@@ -273,16 +288,18 @@ def test_initpkg_defaults(monkeypatch):
     monkeypatch.setitem(sys.modules, 'hello', mod)
     apipkg.initpkg('hello', {})
     newmod = sys.modules['hello']
-    assert newmod.__file__ == None
+    assert newmod.__file__ is None
     assert not hasattr(newmod, '__version__')
 
+
 def test_name_attribute():
     api = apipkg.ApiModule('name_test', {
         'subpkg': {},
         })
     assert api.__name__ == 'name_test'
     assert api.subpkg.__name__ == 'name_test.subpkg'
 
+
 def test_error_loading_one_element(monkeypatch, tmpdir):
     pkgdir = tmpdir.mkdir("errorloading1")
     pkgdir.join('__init__.py').write(py.code.Source("""
@@ -301,6 +318,7 @@ def test_error_loading_one_element(monkeypatch, tmpdir):
     py.test.raises(ImportError, 'errorloading1.x')
     py.test.raises(ImportError, 'errorloading1.x')
 
+
 def test_onfirstaccess(tmpdir, monkeypatch):
     pkgdir = tmpdir.mkdir("firstaccess")
     pkgdir.join('__init__.py').write(py.code.Source("""
@@ -323,7 +341,8 @@ def init():
     assert len(firstaccess.l) == 1
     assert '__onfirstaccess__' not in firstaccess.__all__
 
-@py.test.mark.multi(mode=['attr', 'dict', 'onfirst'])
+
+@pytest.mark.parametrize('mode', ['attr', 'dict', 'onfirst'])
 def test_onfirstaccess_setsnewattr(tmpdir, monkeypatch, mode):
     pkgname = 'mode_' + mode
     pkgdir = tmpdir.mkdir(pkgname)
@@ -352,6 +371,7 @@ def init():
         assert not hasattr(mod, '__onfirstaccess__')
     assert '__onfirstaccess__' not in vars(mod)
 
+
 def test_bpython_getattr_override(tmpdir, monkeypatch):
     def patchgetattr(self, name):
         raise AttributeError(name)
@@ -363,12 +383,10 @@ def patchgetattr(self, name):
     assert 'abspath' in d
 
 
-
-
 def test_chdir_with_relative_imports_shouldnt_break_lazy_loading(tmpdir):
     tmpdir.join('apipkg.py').write(py.code.Source(apipkg))
     pkg = tmpdir.mkdir('pkg')
-    messy = tmpdir.mkdir('messy')
+    tmpdir.mkdir('messy')
     pkg.join('__init__.py').write(py.code.Source("""
         import apipkg
         apipkg.initpkg(__name__, {
@@ -408,6 +426,7 @@ def test_dotted_name_lookup(tmpdir, monkeypatch):
     import dotted_name_lookup
     assert dotted_name_lookup.abs == py.std.os.path.abspath
 
+
 def test_extra_attributes(tmpdir, monkeypatch):
     pkgdir = tmpdir.mkdir("extra_attributes")
     pkgdir.join('__init__.py').write(py.code.Source("""
@@ -418,30 +437,35 @@ def test_extra_attributes(tmpdir, monkeypatch):
     import extra_attributes
     assert extra_attributes.foo == 'bar'
 
+
 def test_aliasmodule_aliases_an_attribute():
     am = apipkg.AliasModule("mymod", "pprint", 'PrettyPrinter')
     r = repr(am)
     assert "<AliasModule 'mymod' for 'pprint.PrettyPrinter'>" == r
     assert am.format
     assert not hasattr(am, "lqkje")
 
+
 def test_aliasmodule_aliases_unimportable():
     am = apipkg.AliasModule("mymod", "qlwkejqlwe", 'main')
     r = repr(am)
     assert "<AliasModule 'mymod' for 'qlwkejqlwe.main'>" == r
     assert am.qwe is None
 
+
 def test_aliasmodule_unicode():
     am = apipkg.AliasModule(py.builtin._totext("mymod"), "pprint")
     assert am
 
+
 def test_aliasmodule_repr():
     am = apipkg.AliasModule("mymod", "sys")
     r = repr(am)
     assert "<AliasModule 'mymod' for 'sys'>" == r
     am.version
     assert repr(am) == r
 
+
 def test_aliasmodule_proxy_methods(tmpdir, monkeypatch):
     pkgdir = tmpdir
     pkgdir.join('aliasmodule_proxy.py').write(py.code.Source("""
@@ -470,6 +494,7 @@ def doit():
     proxy.doit = doit
     assert orig.doit is doit
 
+
 def test_aliasmodule_nested_import_with_from(tmpdir, monkeypatch):
     import os
     pkgdir = tmpdir.mkdir("api1")

test_apipkg.py

@@ -1,12 +1,22 @@
 [tox]
-envlist=py27,py26,py33,py34,jython
+envlist=py27,py26,py33,py34,jython,flakes
 
 [tox:hudson]
 sdistsrc={distshare}/apipkg-*
 
 [testenv]
-commands=py.test []
 deps=pytest
+commands=py.test []
 
 [testenv:jython]
+deps=pytest
 commands=py.test-jython []
+
+[testenv:flakes]
+deps=flake8
+commands=flake8
+
+
+[flake8]
+exclude=.tox/.env/,dist/,build/,example/
+max_complexity=11