summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeador Inge <meadori@gmail.com>2011-11-28 15:27:32 (GMT)
committerMeador Inge <meadori@gmail.com>2011-11-28 15:27:32 (GMT)
commit22b9b379159f953ad4805980644414354030624f (patch)
tree7a3d34e3da6f91ca9f877907fe16e09a40347d8a
parent7be8f68d37b82ffd901eb07fee4ed92a5c8955dc (diff)
downloadcpython-22b9b379159f953ad4805980644414354030624f.zip
cpython-22b9b379159f953ad4805980644414354030624f.tar.gz
cpython-22b9b379159f953ad4805980644414354030624f.tar.bz2
Issue #12618: py_compile cannot create files in current directory
Initial patch by Sjoerd de Vries.
-rw-r--r--Lib/py_compile.py4
-rw-r--r--Lib/test/test_py_compile.py9
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
4 files changed, 16 insertions, 1 deletions
diff --git a/Lib/py_compile.py b/Lib/py_compile.py
index e0f98cb..5adb70a 100644
--- a/Lib/py_compile.py
+++ b/Lib/py_compile.py
@@ -130,7 +130,9 @@ def compile(file, cfile=None, dfile=None, doraise=False, optimize=-1):
else:
cfile = imp.cache_from_source(file)
try:
- os.makedirs(os.path.dirname(cfile))
+ dirname = os.path.dirname(cfile)
+ if dirname:
+ os.makedirs(dirname)
except OSError as error:
if error.errno != errno.EEXIST:
raise
diff --git a/Lib/test/test_py_compile.py b/Lib/test/test_py_compile.py
index 8ad0897..f3c1a6a 100644
--- a/Lib/test/test_py_compile.py
+++ b/Lib/test/test_py_compile.py
@@ -39,6 +39,15 @@ class PyCompileTests(unittest.TestCase):
py_compile.compile(self.source_path)
self.assertTrue(os.path.exists(self.cache_path))
+ def test_cwd(self):
+ cwd = os.getcwd()
+ os.chdir(self.directory)
+ py_compile.compile(os.path.basename(self.source_path),
+ os.path.basename(self.pyc_path))
+ os.chdir(cwd)
+ self.assertTrue(os.path.exists(self.pyc_path))
+ self.assertFalse(os.path.exists(self.cache_path))
+
def test_relative_path(self):
py_compile.compile(os.path.relpath(self.source_path),
os.path.relpath(self.pyc_path))
diff --git a/Misc/ACKS b/Misc/ACKS
index 7f7296e..5d75404 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -941,6 +941,7 @@ Kannan Vijayan
Kurt Vile
Norman Vine
Frank Visser
+Sjoerd de Vries
Niki W. Waibel
Wojtek Walczak
Charles Waldman
diff --git a/Misc/NEWS b/Misc/NEWS
index eaadaaf..3041a73 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -83,6 +83,9 @@ Core and Builtins
Library
-------
+- Issue #12618: Fix a bug that prevented py_compile from creating byte
+ compiled files in the current directory. Initial patch by Sjoerd de Vries.
+
- Issue #13444: When stdout has been closed explicitly, we should not attempt
to flush it at shutdown and print an error.