jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Always check for both ENOENT and ENOTDIR 

This fixes issue 326.
This commit is contained in:
Floris Bruynooghe 2013-07-06 18:53:26 +02:00
parent e6a063ee47
commit c36186ce65
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
_pytest/assertion/rewrite.py
View File

@ -15,12 +15,6 @@ import py
from _pytest.assertion import util from _pytest.assertion import util
# Windows gives ENOENT in places *nix gives ENOTDIR.
if sys.platform.startswith("win"):
PATH_COMPONENT_NOT_DIR = errno.ENOENT
else:
PATH_COMPONENT_NOT_DIR = errno.ENOTDIR
# py.test caches rewritten pycs in __pycache__. # py.test caches rewritten pycs in __pycache__.
if hasattr(imp, "get_tag"): if hasattr(imp, "get_tag"):
PYTEST_TAG = imp.get_tag() + "-PYTEST" PYTEST_TAG = imp.get_tag() + "-PYTEST"
@ -119,7 +113,7 @@ class AssertionRewritingHook(object):
# common case) or it's blocked by a non-dir node. In the # common case) or it's blocked by a non-dir node. In the
# latter case, we'll ignore it in _write_pyc. # latter case, we'll ignore it in _write_pyc.
pass pass
elif e == PATH_COMPONENT_NOT_DIR: elif e in [errno.ENOENT, errno.ENOTDIR]:
# One of the path components was not a directory, likely # One of the path components was not a directory, likely
# because we're in a zip file. # because we're in a zip file.
write = False write = False
@ -173,7 +167,7 @@ def _write_pyc(co, source_path, pyc):
fp = open(pyc, "wb") fp = open(pyc, "wb")
except IOError: except IOError:
err = sys.exc_info()[1].errno err = sys.exc_info()[1].errno
if err == PATH_COMPONENT_NOT_DIR: if err in [errno.ENOENT, errno.ENOTDIR]:
# This happens when we get a EEXIST in find_module creating the # This happens when we get a EEXIST in find_module creating the
# __pycache__ directory and __pycache__ is by some non-dir node. # __pycache__ directory and __pycache__ is by some non-dir node.
return False return False