Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

python3: make lopen a direct alias for the builtin open

Browse Source 
Thanks to PEP 0446, its reason to exist no longer applies and it is the
default behavior. However, trying to use it on python3 resulted in
errors since "e" is no longer a valid open() mode.
This commit is contained in:
Eli Schwartz 2019-03-21 16:53:31 -04:00
parent 09e97e5af1
commit 69711828bd
No known key found for this signature in database
GPG Key ID: CEB167EFB5722BD6
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/startup.py
View File

@ -10,7 +10,7 @@ Perform various initialization tasks.
import locale, sys import locale, sys
# Default translation is NOOP # Default translation is NOOP
from polyglot.builtins import builtins, unicode_type from polyglot.builtins import builtins, is_py3, unicode_type
builtins.__dict__['_'] = lambda s: s builtins.__dict__['_'] = lambda s: s
# For strings which belong in the translation tables, but which shouldn't be # For strings which belong in the translation tables, but which shouldn't be
@ -125,7 +125,9 @@ if not _run_once:
pass pass
# local_open() opens a file that wont be inherited by child processes # local_open() opens a file that wont be inherited by child processes
if iswindows: if is_py3:
local_open = open # PEP 446
elif iswindows:
def local_open(name, mode='r', bufsize=-1): def local_open(name, mode='r', bufsize=-1):
mode += 'N' mode += 'N'
return open(name, mode, bufsize) return open(name, mode, bufsize)
@ -223,6 +225,8 @@ def test_lopen():
if win32api.GetHandleInformation(msvcrt.get_osfhandle(f.fileno())) & 0b1: if win32api.GetHandleInformation(msvcrt.get_osfhandle(f.fileno())) & 0b1:
raise SystemExit('File handle is inheritable!') raise SystemExit('File handle is inheritable!')
else: else:
import fcntl
def assert_not_inheritable(f): def assert_not_inheritable(f):
if not fcntl.fcntl(f, fcntl.F_GETFD) & fcntl.FD_CLOEXEC: if not fcntl.fcntl(f, fcntl.F_GETFD) & fcntl.FD_CLOEXEC:
raise SystemExit('File handle is inheritable!') raise SystemExit('File handle is inheritable!')
@ -238,14 +242,14 @@ def test_lopen():
print('O_CREAT tested') print('O_CREAT tested')
with copen(n, 'w+b') as f: with copen(n, 'w+b') as f:
f.write('two') f.write(b'two')
with copen(n, 'r') as f: with copen(n, 'r') as f:
if f.read() == 'two': if f.read() == 'two':
print('O_TRUNC tested') print('O_TRUNC tested')
else: else:
raise Exception('O_TRUNC failed') raise Exception('O_TRUNC failed')
with copen(n, 'ab') as f: with copen(n, 'ab') as f:
f.write('three') f.write(b'three')
with copen(n, 'r+') as f: with copen(n, 'r+') as f:
if f.read() == 'twothree': if f.read() == 'twothree':
print('O_APPEND tested') print('O_APPEND tested')