Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
707033a6
Commit
707033a6
authored
Oct 17, 2011
by
Antoine Pitrou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #13146: Writing a pyc file is now atomic under POSIX.
parent
5b9f4c15
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
61 additions
and
12 deletions
+61
-12
Lib/importlib/_bootstrap.py
Lib/importlib/_bootstrap.py
+23
-3
Misc/NEWS
Misc/NEWS
+2
-0
Python/import.c
Python/import.c
+36
-9
No files found.
Lib/importlib/_bootstrap.py
View file @
707033a6
...
...
@@ -80,6 +80,27 @@ def _path_absolute(path):
return
_path_join
(
_os
.
getcwd
(),
path
)
def
_write_atomic
(
path
,
data
):
"""Best-effort function to write data to a path atomically."""
if
not
sys
.
platform
.
startswith
(
'win'
):
# On POSIX-like platforms, renaming is atomic
path_tmp
=
path
+
'.tmp'
try
:
fd
=
_os
.
open
(
path_tmp
,
_os
.
O_EXCL
|
_os
.
O_CREAT
|
_os
.
O_WRONLY
)
with
_io
.
FileIO
(
fd
,
'wb'
)
as
file
:
file
.
write
(
data
)
_os
.
rename
(
path_tmp
,
path
)
except
OSError
:
try
:
_os
.
unlink
(
path_tmp
)
except
OSError
:
pass
raise
else
:
with
_io
.
FileIO
(
path
,
'wb'
)
as
file
:
file
.
write
(
data
)
def
_wrap
(
new
,
old
):
"""Simple substitute for functools.wraps."""
for
replace
in
[
'__module__'
,
'__name__'
,
'__doc__'
]:
...
...
@@ -494,9 +515,8 @@ class _SourceFileLoader(_FileLoader, SourceLoader):
else
:
raise
try
:
with
_io
.
FileIO
(
path
,
'wb'
)
as
file
:
file
.
write
(
data
)
except
IOError
as
exc
:
_write_atomic
(
path
,
data
)
except
OSError
as
exc
:
# Don't worry if you can't write bytecode.
if
exc
.
errno
==
errno
.
EACCES
:
return
...
...
Misc/NEWS
View file @
707033a6
...
...
@@ -10,6 +10,8 @@ What's New in Python 3.3 Alpha 1?
Core and Builtins
-----------------
- Issue #13146: Writing a pyc file is now atomic under POSIX.
- Issue #7833: Extension modules built using distutils on Windows will no
longer include a "manifest" to prevent them failing at import time in some
embedded situations.
...
...
Python/import.c
View file @
707033a6
...
...
@@ -1284,7 +1284,8 @@ write_compiled_module(PyCodeObject *co, PyObject *cpathname,
#ifdef MS_WINDOWS
int
fd
;
#else
PyObject
*
cpathbytes
;
PyObject
*
cpathbytes
,
*
cpathbytes_tmp
;
Py_ssize_t
cpathbytes_len
;
#endif
PyObject
*
dirname
;
Py_UCS4
*
dirsep
;
...
...
@@ -1345,13 +1346,25 @@ write_compiled_module(PyCodeObject *co, PyObject *cpathname,
else
fp
=
NULL
;
#else
/* Under POSIX, we first write to a tmp file and then take advantage
of atomic renaming. */
cpathbytes
=
PyUnicode_EncodeFSDefault
(
cpathname
);
if
(
cpathbytes
==
NULL
)
{
PyErr_Clear
();
return
;
}
cpathbytes_len
=
PyBytes_GET_SIZE
(
cpathbytes
);
cpathbytes_tmp
=
PyBytes_FromStringAndSize
(
NULL
,
cpathbytes_len
+
4
);
if
(
cpathbytes_tmp
==
NULL
)
{
Py_DECREF
(
cpathbytes
);
PyErr_Clear
();
return
;
}
memcpy
(
PyBytes_AS_STRING
(
cpathbytes_tmp
),
PyBytes_AS_STRING
(
cpathbytes
),
cpathbytes_len
);
memcpy
(
PyBytes_AS_STRING
(
cpathbytes_tmp
)
+
cpathbytes_len
,
".tmp"
,
4
);
fp
=
open_exclusive
(
PyBytes_AS_STRING
(
cpathbytes
),
mode
);
fp
=
open_exclusive
(
PyBytes_AS_STRING
(
cpathbytes
_tmp
),
mode
);
#endif
if
(
fp
==
NULL
)
{
if
(
Py_VerboseFlag
)
...
...
@@ -1359,6 +1372,7 @@ write_compiled_module(PyCodeObject *co, PyObject *cpathname,
"# can't create %R
\n
"
,
cpathname
);
#ifndef MS_WINDOWS
Py_DECREF
(
cpathbytes
);
Py_DECREF
(
cpathbytes_tmp
);
#endif
return
;
}
...
...
@@ -1366,6 +1380,11 @@ write_compiled_module(PyCodeObject *co, PyObject *cpathname,
/* First write a 0 for mtime */
PyMarshal_WriteLongToFile
(
0L
,
fp
,
Py_MARSHAL_VERSION
);
PyMarshal_WriteObjectToFile
((
PyObject
*
)
co
,
fp
,
Py_MARSHAL_VERSION
);
fflush
(
fp
);
/* Now write the true mtime */
fseek
(
fp
,
4L
,
0
);
assert
(
mtime
<
LONG_MAX
);
PyMarshal_WriteLongToFile
((
long
)
mtime
,
fp
,
Py_MARSHAL_VERSION
);
if
(
fflush
(
fp
)
!=
0
||
ferror
(
fp
))
{
if
(
Py_VerboseFlag
)
PySys_FormatStderr
(
"# can't write %R
\n
"
,
cpathname
);
...
...
@@ -1374,20 +1393,28 @@ write_compiled_module(PyCodeObject *co, PyObject *cpathname,
#ifdef MS_WINDOWS
(
void
)
DeleteFileW
(
PyUnicode_AS_UNICODE
(
cpathname
));
#else
(
void
)
unlink
(
PyBytes_AS_STRING
(
cpathbytes
));
(
void
)
unlink
(
PyBytes_AS_STRING
(
cpathbytes
_tmp
));
Py_DECREF
(
cpathbytes
);
Py_DECREF
(
cpathbytes_tmp
);
#endif
return
;
}
fclose
(
fp
);
/* Under POSIX, do an atomic rename */
#ifndef MS_WINDOWS
if
(
rename
(
PyBytes_AS_STRING
(
cpathbytes_tmp
),
PyBytes_AS_STRING
(
cpathbytes
)))
{
if
(
Py_VerboseFlag
)
PySys_FormatStderr
(
"# can't write %R
\n
"
,
cpathname
);
/* Don't keep tmp file */
unlink
(
PyBytes_AS_STRING
(
cpathbytes_tmp
));
Py_DECREF
(
cpathbytes
);
Py_DECREF
(
cpathbytes_tmp
);
return
;
}
Py_DECREF
(
cpathbytes
);
Py_DECREF
(
cpathbytes_tmp
);
#endif
/* Now write the true mtime */
fseek
(
fp
,
4L
,
0
);
assert
(
mtime
<
LONG_MAX
);
PyMarshal_WriteLongToFile
((
long
)
mtime
,
fp
,
Py_MARSHAL_VERSION
);
fflush
(
fp
);
fclose
(
fp
);
if
(
Py_VerboseFlag
)
PySys_FormatStderr
(
"# wrote %R
\n
"
,
cpathname
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment