Merge pull request #180 from pytest-dev/fix-py-error

fix up py.error importability

Author: RonnyPfannschmidt

CHANGELOG

@@ -2,6 +2,7 @@
 =====
 
 - fix #169, #170: error importing py.log on Windows: no module named ``syslog``.
+- fix #179: ensure we can support 'from py.error import ...'
 
 1.5.1
 =====

py/__init__.py

@@ -8,7 +8,7 @@
 
 (c) Holger Krekel and others, 2004-2014
 """
-__version__ = '1.5.2'
+from py._error import error
 
 try:
     from py._vendored_packages import apipkg
@@ -18,15 +18,12 @@
     import apipkg
     lib_not_mangled_by_packagers = False
     vendor_prefix = ''
+__version__ = '1.5.2'
 
-# so that py.error.* instances are picklable
-import sys
 
-apipkg.initpkg(__name__, attr={'_apipkg': apipkg}, exportdefs={
+apipkg.initpkg(__name__, attr={'_apipkg': apipkg, 'error': error}, exportdefs={
     # access to all standard lib modules
     'std': '._std:std',
-    # access to all posix errno's as classes
-    'error': '._error:error',
 
     '_pydir' : '.__metainfo:pydir',
     'version': 'py:__version__', # backward compatibility

testing/root/test_error.py

@@ -2,6 +2,8 @@
 import py
 
 import errno
+import sys
+import subprocess
 
 
 def test_error_classes():
@@ -33,7 +35,7 @@ def test_unknown_error():
     assert cls is cls2
 
 
-def test_error_conversion_ENOTDIR(testdir):
+def test_error_conversion_enotdir(testdir):
     p = testdir.makepyfile("")
     excinfo = py.test.raises(py.error.Error, py.error.checked_call, p.listdir)
     assert isinstance(excinfo.value, EnvironmentError)
@@ -46,6 +48,12 @@ def test_checked_call_supports_kwargs(tmpdir):
     py.error.checked_call(tempfile.mkdtemp, dir=str(tmpdir))
 
 
+def test_error_importable():
+    """Regression test for #179"""
+    subprocess.check_call(
+        [sys.executable, '-c', 'from py.error import ENOENT'])
+
+
 try:
     import unittest
     unittest.TestCase.assertWarns
@@ -56,13 +64,13 @@ def test_checked_call_supports_kwargs(tmpdir):
     import warnings
 
     class Case(unittest.TestCase):
-        def test_assertWarns(self):
+        def test_assert_warns(self):
             # Clear everything "py.*" from sys.modules and re-import py
             # as a fresh start
             for mod in tuple(sys.modules.keys()):
                 if mod and (mod == 'py' or mod.startswith('py.')):
                     del sys.modules[mod]
-            import py
+            __import__('py')
 
             with self.assertWarns(UserWarning):
                 warnings.warn('this should work')

tox.ini

@@ -4,13 +4,13 @@ envlist=py{27,34,35,36}-pytest{29,30,31}
 [testenv]
 changedir=testing
 commands=
-    pip install -U .. # hande the install order fallout since pytest depends on pip
-	
-	py.test --confcutdir=.. -rfsxX --junitxml={envlogdir}/junit-{envname}.xml []
+  pip install -U .. # hande the install order fallout since pytest depends on pip
+  py.test --confcutdir=.. -rfsxX --junitxml={envlogdir}/junit-{envname}.xml []
 deps=
-	pytest29: pytest~=2.9.0
-	pytest30: pytest~=3.0.0
-	pytest31: pytest~=3.1.0
+  attrs
+  pytest29: pytest~=2.9.0
+  pytest30: pytest~=3.0.0
+  pytest31: pytest~=3.1.0
 
 [testenv:py27-xdist]
 basepython=python2.7