[Python-checkins] r74085 - in python/branches/release26-maint: Lib/test/test_import.py Misc/NEWS Python/import.c
r.david.murray
python-checkins at python.org
Sun Jul 19 03:44:23 CEST 2009
Author: r.david.murray
Date: Sun Jul 19 03:44:23 2009
New Revision: 74085
Log:
Merged revisions 73870,73879,73899-73900,73905-73906 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73870 | r.david.murray | 2009-07-06 21:06:13 -0400 (Mon, 06 Jul 2009) | 5 lines
Issue 6070: when creating a compiled file, after copying the mode bits, on
posix zap the execute bit in case it was set on the .py file, since the
compiled files are not directly executable on posix. Patch by Marco N.
........
r73879 | r.david.murray | 2009-07-07 05:54:16 -0400 (Tue, 07 Jul 2009) | 3 lines
Update issue 6070 patch to match the patch that was actually tested
on Windows.
........
r73899 | r.david.murray | 2009-07-08 21:43:41 -0400 (Wed, 08 Jul 2009) | 3 lines
Conditionalize test cleanup code to eliminate traceback, which will
hopefully reveal the real problem.
........
r73900 | r.david.murray | 2009-07-08 22:06:17 -0400 (Wed, 08 Jul 2009) | 2 lines
Make test work with -O.
........
r73905 | r.david.murray | 2009-07-09 09:55:44 -0400 (Thu, 09 Jul 2009) | 3 lines
Specify umask in execute bit test to get consistent results
and make sure we test resetting all three execute bits.
........
r73906 | r.david.murray | 2009-07-09 11:35:33 -0400 (Thu, 09 Jul 2009) | 5 lines
Curdir needs to be in the path for the test to work on all buildbots.
(I copied this from another import test, but currently this will fail if
TESTFN ends up in /tmp...see issue 2609).
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Lib/test/test_import.py
python/branches/release26-maint/Misc/NEWS
python/branches/release26-maint/Python/import.c
Modified: python/branches/release26-maint/Lib/test/test_import.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_import.py (original)
+++ python/branches/release26-maint/Lib/test/test_import.py Sun Jul 19 03:44:23 2009
@@ -1,12 +1,14 @@
import unittest
import os
+import stat
import random
import shutil
import sys
import py_compile
import warnings
import marshal
-from test.test_support import unlink, TESTFN, unload, run_unittest, check_warnings
+from test.test_support import (unlink, TESTFN, unload, run_unittest,
+ check_warnings, TestFailed)
def remove_files(name):
@@ -91,6 +93,32 @@
finally:
del sys.path[0]
+ if os.name == 'posix':
+ def test_execute_bit_not_copied(self):
+ # Issue 6070: under posix .pyc files got their execute bit set if
+ # the .py file had the execute bit set, but they aren't executable.
+ oldmask = os.umask(022)
+ sys.path.insert(0, os.curdir)
+ try:
+ fname = TESTFN + os.extsep + "py"
+ f = open(fname, 'w').close()
+ os.chmod(fname, (stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH |
+ stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH))
+ __import__(TESTFN)
+ fn = fname + 'c'
+ if not os.path.exists(fn):
+ fn = fname + 'o'
+ if not os.path.exists(fn): raise TestFailed("__import__ did "
+ "not result in creation of either a .pyc or .pyo file")
+ s = os.stat(fn)
+ self.assertEquals(stat.S_IMODE(s.st_mode),
+ stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH)
+ finally:
+ os.umask(oldmask)
+ remove_files(TESTFN)
+ if TESTFN in sys.modules: del sys.modules[TESTFN]
+ del sys.path[0]
+
def testImpModule(self):
# Verify that the imp module can correctly load and find .py files
import imp
@@ -232,6 +260,7 @@
else:
self.fail("import by path didn't raise an exception")
+
class TestPycRewriting(unittest.TestCase):
# Test that the `co_filename` attribute on code objects always points
# to the right file, even when various things happen (e.g. both the .py
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS (original)
+++ python/branches/release26-maint/Misc/NEWS Sun Jul 19 03:44:23 2009
@@ -12,6 +12,9 @@
Core and Builtins
-----------------
+- Issue #6070: On posix platforms import no longer copies the execute bit
+ from the .py file to the .pyc file if it is set.
+
- Issue #4547: When debugging a very large function, it was not always
possible to update the lineno attribute of the current frame.
Modified: python/branches/release26-maint/Python/import.c
==============================================================================
--- python/branches/release26-maint/Python/import.c (original)
+++ python/branches/release26-maint/Python/import.c Sun Jul 19 03:44:23 2009
@@ -879,7 +879,11 @@
{
FILE *fp;
time_t mtime = srcstat->st_mtime;
- mode_t mode = srcstat->st_mode;
+#ifdef MS_WINDOWS /* since Windows uses different permissions */
+ mode_t mode = srcstat->st_mode & ~S_IEXEC;
+#else
+ mode_t mode = srcstat->st_mode & ~S_IXUSR & ~S_IXGRP & ~S_IXOTH;
+#endif
fp = open_exclusive(cpathname, mode);
if (fp == NULL) {
More information about the Python-checkins
mailing list