summaryrefslogtreecommitdiff
path: root/django/core/files/move.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/core/files/move.py')
-rw-r--r--django/core/files/move.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/django/core/files/move.py b/django/core/files/move.py
index 3af02634fe..4519dedf97 100644
--- a/django/core/files/move.py
+++ b/django/core/files/move.py
@@ -62,7 +62,7 @@ def file_move_safe(old_file_name, new_file_name, chunk_size = 1024*64, allow_ove
with open(old_file_name, 'rb') as old_file:
# now open the new file, not forgetting allow_overwrite
fd = os.open(new_file_name, os.O_WRONLY | os.O_CREAT | getattr(os, 'O_BINARY', 0) |
- (not allow_overwrite and os.O_EXCL or 0))
+ (os.O_EXCL if not allow_overwrite else 0))
try:
locks.lock(fd, locks.LOCK_EX)
current_chunk = None
@@ -77,8 +77,8 @@ def file_move_safe(old_file_name, new_file_name, chunk_size = 1024*64, allow_ove
try:
os.remove(old_file_name)
except OSError as e:
- # Certain operating systems (Cygwin and Windows)
- # fail when deleting opened files, ignore it. (For the
+ # Certain operating systems (Cygwin and Windows)
+ # fail when deleting opened files, ignore it. (For the
# systems where this happens, temporary files will be auto-deleted
# on close anyway.)
if getattr(e, 'winerror', 0) != 32 and getattr(e, 'errno', 0) != 13: