mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-19 17:25:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 74058 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r74058 | alexandre.vassalotti | 2009-07-17 06:55:50 -0400 (Fri, 17 Jul 2009) | 36 lines

  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).
  ........
................
This commit is contained in:
R. David Murray 2009-07-19 01:59:05 +00:00
parent 8d15643a4b
commit 07fc01f9ef
2 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Python/import.c
View file

@ -930,7 +930,11 @@ write_compiled_module(PyCodeObject *co, char *cpathname, struct stat *srcstat)
{
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) {