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

Removed another wrapper on stdlib

Browse Source
This commit is contained in:
gryf
2020-04-23 20:16:10 +02:00
parent ea99f5223c
commit 8f1eb9c88c
5 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ebook_converter/__init__.py
View File

@@ -9,10 +9,9 @@ import urllib.parse
import urllib.request import urllib.request
import warnings import warnings
from ebook_converter.polyglot.builtins import hasenv
from functools import partial from functools import partial
if not hasenv('CALIBRE_SHOW_DEPRECATION_WARNINGS'): if os.getenv('CALIBRE_SHOW_DEPRECATION_WARNINGS') is None:
warnings.simplefilter('ignore', DeprecationWarning) warnings.simplefilter('ignore', DeprecationWarning)
try: try:
os.getcwd() os.getcwd()
@@ -155,7 +154,7 @@ def prints(*args, **kwargs):
''' '''
file = kwargs.get('file', sys.stdout) file = kwargs.get('file', sys.stdout)
file = getattr(file, 'buffer', file) file = getattr(file, 'buffer', file)
enc = 'utf-8' if hasenv('CALIBRE_WORKER') else preferred_encoding enc = 'utf-8' if os.getenv('CALIBRE_WORKER') else preferred_encoding
sep = kwargs.get('sep', ' ') sep = kwargs.get('sep', ' ')
if not isinstance(sep, bytes): if not isinstance(sep, bytes):
sep = sep.encode(enc) sep = sep.encode(enc)
@@ -219,7 +218,7 @@ class CommandLineError(Exception):
def setup_cli_handlers(logger, level): def setup_cli_handlers(logger, level):
import logging import logging
if hasenv('CALIBRE_WORKER') and logger.handlers: if os.getenv('CALIBRE_WORKER') and logger.handlers:
return return
logger.setLevel(level) logger.setLevel(level)
if level == logging.WARNING: if level == logging.WARNING:

9
ebook_converter/constants.py
View File

@@ -5,7 +5,7 @@ import locale
import os import os
import sys import sys
from ebook_converter.polyglot.builtins import environ_item, hasenv, as_unicode from ebook_converter.polyglot.builtins import environ_item, as_unicode
__appname__ = 'calibre' __appname__ = 'calibre'
numeric_version = (4, 12, 0) numeric_version = (4, 12, 0)
@@ -30,14 +30,15 @@ ishaiku = 'haiku1' in _plat
islinux = not(iswindows or isosx or isbsd or ishaiku) islinux = not(iswindows or isosx or isbsd or ishaiku)
isfrozen = hasattr(sys, 'frozen') isfrozen = hasattr(sys, 'frozen')
isunix = isosx or islinux or ishaiku isunix = isosx or islinux or ishaiku
isportable = hasenv('CALIBRE_PORTABLE_BUILD') isportable = os.getenv('CALIBRE_PORTABLE_BUILD') is not None
isxp = isoldvista = False isxp = isoldvista = False
if iswindows: if iswindows:
wver = sys.getwindowsversion() wver = sys.getwindowsversion()
isxp = wver.major < 6 isxp = wver.major < 6
isoldvista = wver.build < 6002 isoldvista = wver.build < 6002
is64bit = sys.maxsize > (1 << 32) is64bit = sys.maxsize > (1 << 32)
isworker = hasenv('CALIBRE_WORKER') or hasenv('CALIBRE_SIMPLE_WORKER') isworker = any([os.getenv('CALIBRE_WORKER') or
os.getenv('CALIBRE_SIMPLE_WORKER')])
if isworker: if isworker:
os.environ.pop(environ_item('CALIBRE_FORCE_ANSI'), None) os.environ.pop(environ_item('CALIBRE_FORCE_ANSI'), None)
FAKE_PROTOCOL, FAKE_HOST = 'clbr', 'internal.invalid' FAKE_PROTOCOL, FAKE_HOST = 'clbr', 'internal.invalid'
@@ -92,7 +93,7 @@ else:
filesystem_encoding = 'utf-8' filesystem_encoding = 'utf-8'
DEBUG = hasenv('CALIBRE_DEBUG') DEBUG = os.getenv('CALIBRE_DEBUG') is not None
def debug(): def debug():

1
ebook_converter/customize/ui.py
View File

@@ -9,7 +9,6 @@ from ebook_converter.customize import (CatalogPlugin, FileTypePlugin, PluginNotF
StoreBase as Store, EditBookToolPlugin, StoreBase as Store, EditBookToolPlugin,
LibraryClosedPlugin) LibraryClosedPlugin)
from ebook_converter.customize.conversion import InputFormatPlugin, OutputFormatPlugin from ebook_converter.customize.conversion import InputFormatPlugin, OutputFormatPlugin
from ebook_converter.customize.zipplugin import loader
from ebook_converter.customize.profiles import InputProfile, OutputProfile from ebook_converter.customize.profiles import InputProfile, OutputProfile
from ebook_converter.customize.builtins import plugins as builtin_plugins from ebook_converter.customize.builtins import plugins as builtin_plugins
# from ebook_converter.devices.interface import DevicePlugin # from ebook_converter.devices.interface import DevicePlugin

2
ebook_converter/customize/zipplugin.py
View File

@@ -294,7 +294,7 @@ class PluginLoader(object):
loader = PluginLoader() loader = PluginLoader()
sys.meta_path.insert(0, loader) #sys.meta_path.insert(0, loader)
if __name__ == '__main__': if __name__ == '__main__':

5
ebook_converter/polyglot/builtins.py
View File

@@ -1,9 +1,4 @@
import importlib import importlib
import os
def hasenv(x):
return os.getenv(x) is not None
def as_bytes(x, encoding='utf-8'): def as_bytes(x, encoding='utf-8'):