gryf/ebook-converter
1
0
Fork 0
mirror of https://github.com/gryf/ebook-converter.git synced 2026-04-01 01:43:33 +02:00
Code Issues Projects Releases Wiki Activity

Removed another unicode/string nonsense

Browse Source
This commit is contained in:
gryf
2020-04-23 19:51:25 +02:00
parent de4f8a444b
commit 16d169d0d6
13 changed files with 20 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ from ebook_converter.constants import isosx, isfrozen, filesystem_encoding
from ebook_converter.utils.config import prefs
from ebook_converter.ptempfile import PersistentTemporaryFile, base_dir
from ebook_converter.utils.serialize import msgpack_dumps
from ebook_converter.polyglot.builtins import environ_item, native_string_type
from ebook_converter.polyglot.builtins import environ_item
from ebook_converter.polyglot.binary import as_hex_unicode
try:
import win32process
@@ -14,11 +14,6 @@ except ImportError:
iswindows = False
__license__ = 'GPL v3'
__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en'
if iswindows:
try:
windows_null_file = open(os.devnull, 'wb')
@@ -89,9 +84,9 @@ class Worker(object):
@property
def env(self):
env = os.environ.copy()
env[native_string_type('CALIBRE_WORKER')] = environ_item('1')
env['CALIBRE_WORKER'] = environ_item('1')
td = as_hex_unicode(msgpack_dumps(base_dir()))
env[native_string_type('CALIBRE_WORKER_TEMP_DIR')] = environ_item(td)
env['CALIBRE_WORKER_TEMP_DIR'] = environ_item(td)
env.update(self._env)
return env
@@ -154,7 +149,7 @@ class Worker(object):
except EnvironmentError:
# cwd no longer exists
origwd = cwd or os.path.expanduser('~')
env[native_string_type('ORIGWD')] = environ_item(as_hex_unicode(msgpack_dumps(origwd)))
env['ORIGWD'] = environ_item(as_hex_unicode(msgpack_dumps(origwd)))
_cwd = cwd
if priority is None:
priority = prefs['worker_process_priority']