gryf/ebook-converter
1
0
Fork 0
mirror of https://github.com/gryf/ebook-converter.git synced 2026-03-29 08:03:31 +02:00
Code Issues Projects Releases Wiki Activity

Get rid of environ_item function

Browse Source
This commit is contained in:
gryf
2020-06-17 17:56:31 +02:00
parent 927e4fe978
commit b1ae3f74f4
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ebook_converter/constants_old.py
View File

@@ -5,7 +5,6 @@ import locale
import os import os
import sys import sys
from ebook_converter.polyglot.builtins import environ_item
__appname__ = 'calibre' __appname__ = 'calibre'
numeric_version = (4, 12, 0) numeric_version = (4, 12, 0)
@@ -40,7 +39,7 @@ is64bit = sys.maxsize > (1 << 32)
isworker = any([os.getenv('CALIBRE_WORKER') or isworker = any([os.getenv('CALIBRE_WORKER') or
os.getenv('CALIBRE_SIMPLE_WORKER')]) os.getenv('CALIBRE_SIMPLE_WORKER')])
if isworker: if isworker:
os.environ.pop(environ_item('CALIBRE_FORCE_ANSI'), None) os.environ.pop('CALIBRE_FORCE_ANSI', None)
FAKE_PROTOCOL, FAKE_HOST = 'clbr', 'internal.invalid' FAKE_PROTOCOL, FAKE_HOST = 'clbr', 'internal.invalid'
VIEWER_APP_UID = 'com.calibre-ebook.viewer' VIEWER_APP_UID = 'com.calibre-ebook.viewer'
EDITOR_APP_UID = 'com.calibre-ebook.edit-book' EDITOR_APP_UID = 'com.calibre-ebook.edit-book'

6
ebook_converter/polyglot/builtins.py
View File

@@ -20,12 +20,6 @@ def error_message(exc):
return str(exc) return str(exc)
def environ_item(x):
if isinstance(x, bytes):
x = x.decode('utf-8')
return x
def exec_path(path, ctx=None): def exec_path(path, ctx=None):
ctx = ctx or {} ctx = ctx or {}
with open(path, 'rb') as f: with open(path, 'rb') as f:

8
ebook_converter/utils/ipc/launch.py
View File

@@ -5,7 +5,6 @@ from ebook_converter.constants_old import isosx, isfrozen, filesystem_encoding
from ebook_converter.utils.config import prefs from ebook_converter.utils.config import prefs
from ebook_converter.ptempfile import PersistentTemporaryFile, base_dir from ebook_converter.ptempfile import PersistentTemporaryFile, base_dir
from ebook_converter.utils.serialize import msgpack_dumps from ebook_converter.utils.serialize import msgpack_dumps
from ebook_converter.polyglot.builtins import environ_item
from ebook_converter.polyglot.binary import as_hex_unicode from ebook_converter.polyglot.binary import as_hex_unicode
try: try:
import win32process import win32process
@@ -83,10 +82,11 @@ class Worker(object):
@property @property
def env(self): def env(self):
__import__('pdb').set_trace()
env = os.environ.copy() env = os.environ.copy()
env['CALIBRE_WORKER'] = environ_item('1') env['CALIBRE_WORKER'] = '1'
td = as_hex_unicode(msgpack_dumps(base_dir())) td = as_hex_unicode(msgpack_dumps(base_dir()))
env['CALIBRE_WORKER_TEMP_DIR'] = environ_item(td) env['CALIBRE_WORKER_TEMP_DIR'] = td
env.update(self._env) env.update(self._env)
return env return env
@@ -149,7 +149,7 @@ class Worker(object):
except EnvironmentError: except EnvironmentError:
# cwd no longer exists # cwd no longer exists
origwd = cwd or os.path.expanduser('~') origwd = cwd or os.path.expanduser('~')
env['ORIGWD'] = environ_item(as_hex_unicode(msgpack_dumps(origwd))) env['ORIGWD'] = as_hex_unicode(msgpack_dumps(origwd))
_cwd = cwd _cwd = cwd
if priority is None: if priority is None:
priority = prefs['worker_process_priority'] priority = prefs['worker_process_priority']