merge again

Author: RonnyPfannschmidt

CHANGELOG

@@ -1,4 +1,9 @@
-1.2.dev
+1.3.dev
+----------------------------------------
+
+- fix issue2 - adapt tests on Jython
+
+1.2
 ----------------------------------------
 
 - Allow to import from Aliasmodules  (thanks Ralf Schmitt)

apipkg.py

@@ -9,7 +9,7 @@
 import sys
 from types import ModuleType
 
-__version__ = '1.2.dev7'
+__version__ = '1.3.dev'
 
 def initpkg(pkgname, exportdefs, attr=dict()):
     """ initialize given package from the export definitions. """

setup.py

@@ -19,7 +19,7 @@ def main():
         description=
         'apipkg: namespace control and lazy-import mechanism',
         long_description = open('README.txt').read(),
-        version='1.2.dev7',
+        version='1.3.dev',
         url='http://bitbucket.org/hpk42/apipkg',
         license='MIT License',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
@@ -38,4 +38,4 @@ def main():
     )
 
 if __name__ == '__main__':
-    main()
+    main()

test_apipkg.py

@@ -6,6 +6,7 @@
 #
 # test support for importing modules
 #
+ModuleType = py.std.types.ModuleType
 
 class TestRealModule:
 
@@ -202,15 +203,15 @@ def parsenamespace(spec):
     return ns
 
 def test_initpkg_replaces_sysmodules(monkeypatch):
-    mod = type(sys)('hello')
+    mod = ModuleType('hello')
     monkeypatch.setitem(sys.modules, 'hello', mod)
     apipkg.initpkg('hello', {'x': 'os.path:abspath'})
     newmod = sys.modules['hello']
     assert newmod != mod
     assert newmod.x == py.std.os.path.abspath
 
 def test_initpkg_transfers_attrs(monkeypatch):
-    mod = type(sys)('hello')
+    mod = ModuleType('hello')
     mod.__version__ = 10
     mod.__file__ = "hello.py"
     mod.__loader__ = "loader"
@@ -225,15 +226,15 @@ def test_initpkg_transfers_attrs(monkeypatch):
     assert newmod.__doc__ == mod.__doc__
 
 def test_initpkg_nodoc(monkeypatch):
-    mod = type(sys)('hello')
+    mod = ModuleType('hello')
     mod.__file__ = "hello.py"
     monkeypatch.setitem(sys.modules, 'hello', mod)
     apipkg.initpkg('hello', {})
     newmod = sys.modules['hello']
     assert not newmod.__doc__
 
 def test_initpkg_overwrite_doc(monkeypatch):
-    hello = type(sys)('hello')
+    hello = ModuleType('hello')
     hello.__doc__ = "this is the documentation"
     monkeypatch.setitem(sys.modules, 'hello', hello)
     apipkg.initpkg('hello', {"__doc__": "sys:__doc__"})
@@ -242,7 +243,7 @@ def test_initpkg_overwrite_doc(monkeypatch):
     assert newhello.__doc__ == sys.__doc__
 
 def test_initpkg_not_transfers_not_existing_attrs(monkeypatch):
-    mod = type(sys)('hello')
+    mod = ModuleType('hello')
     mod.__file__ = "hello.py"
     monkeypatch.setitem(sys.modules, 'hello', mod)
     apipkg.initpkg('hello', {})
@@ -253,7 +254,7 @@ def test_initpkg_not_transfers_not_existing_attrs(monkeypatch):
     assert not hasattr(newmod, '__path__')
 
 def test_initpkg_defaults(monkeypatch):
-    mod = type(sys)('hello')
+    mod = ModuleType('hello')
     monkeypatch.setitem(sys.modules, 'hello', mod)
     apipkg.initpkg('hello', {})
     newmod = sys.modules['hello']

tox.ini

@@ -6,4 +6,7 @@ sdistsrc={distshare}/apipkg-*
 
 [testenv]
 commands=py.test --junitxml={envlogdir}/junit-{envname}.xml []
-deps= py
+deps=pytest
+
+[testenv:jython]
+commands=py.test-jython --junitxml={envlogdir}/junit-{envname}.xml []