Renamed constants, to make room for real constants module

ebook_converter/utils/cleantext.py

@@ -1,7 +1,7 @@
 import re
 import html.entities
 
-from ebook_converter.constants import plugins, preferred_encoding
+from ebook_converter.constants_old import plugins, preferred_encoding
 
 
 def ascii_pat(for_binary=False):

ebook_converter/utils/config.py

@@ -5,7 +5,7 @@ import optparse
 import os
 from copy import deepcopy
 
-from ebook_converter.constants import (
+from ebook_converter.constants_old import (
     CONFIG_DIR_MODE, __appname__, __author__, config_dir, get_version, iswindows
 )
 from ebook_converter.utils.config_base import (

ebook_converter/utils/config_base.py

@@ -9,7 +9,7 @@ from copy import deepcopy
 import pkg_resources
 
 from ebook_converter.utils.lock import ExclusiveFile
-from ebook_converter.constants import config_dir, CONFIG_DIR_MODE, preferred_encoding, filesystem_encoding, iswindows
+from ebook_converter.constants_old import config_dir, CONFIG_DIR_MODE, preferred_encoding, filesystem_encoding, iswindows
 
 plugin_dir = os.path.join(config_dir, 'plugins')
 

ebook_converter/utils/date.py

@@ -3,7 +3,7 @@ from datetime import datetime, time as dtime, timedelta, MINYEAR, MAXYEAR
 from functools import partial
 
 from ebook_converter import strftime
-from ebook_converter.constants import iswindows, isosx, plugins, preferred_encoding
+from ebook_converter.constants_old import iswindows, isosx, plugins, preferred_encoding
 from ebook_converter.utils.iso8601 import utc_tz, local_tz, UNDEFINED_DATE
 from ebook_converter.utils.localization import lcdata
 

ebook_converter/utils/filenames.py

@@ -9,7 +9,7 @@ import time
 from math import ceil
 
 from ebook_converter import force_unicode, isbytestring, prints, sanitize_file_name
-from ebook_converter.constants import (
+from ebook_converter.constants_old import (
     filesystem_encoding, iswindows, plugins, preferred_encoding, isosx
 )
 from ebook_converter.utils.localization import get_udc

ebook_converter/utils/fonts/scanner.py

@@ -3,7 +3,7 @@ from collections import defaultdict
 from threading import Thread
 
 from ebook_converter import walk, prints, as_unicode
-from ebook_converter.constants import (config_dir, iswindows, isosx, plugins, DEBUG,
+from ebook_converter.constants_old import (config_dir, iswindows, isosx, plugins, DEBUG,
         isworker, filesystem_encoding)
 from ebook_converter.utils.fonts.metadata import FontMetadata, UnsupportedFont
 

ebook_converter/utils/formatter.py

@@ -6,7 +6,7 @@ Created on 23 Sep 2010
 import re, string, traceback, numbers
 
 from ebook_converter import prints
-from ebook_converter.constants import DEBUG
+from ebook_converter.constants_old import DEBUG
 from ebook_converter.utils.formatter_functions import formatter_functions
 from ebook_converter.polyglot.builtins import error_message
 

ebook_converter/utils/formatter_functions.py

@@ -7,7 +7,7 @@ import inspect, re, traceback, numbers
 from math import trunc
 
 from ebook_converter import human_readable
-from ebook_converter.constants import DEBUG
+from ebook_converter.constants_old import DEBUG
 from ebook_converter.ebooks.metadata import title_sort
 from ebook_converter.utils.config import tweaks
 from ebook_converter.utils.titlecase import titlecase

ebook_converter/utils/icu.py

@@ -3,7 +3,7 @@ import sys
 import unicodedata
 
 # Setup code {{{
-from ebook_converter.constants import plugins
+from ebook_converter.constants_old import plugins
 from ebook_converter.polyglot.builtins import cmp
 from ebook_converter.utils.config_base import tweaks
 

ebook_converter/utils/img.py

@@ -12,7 +12,7 @@ from threading import Thread
 #from PyQt5.QtGui import QColor, QImage, QImageReader, QImageWriter, QPixmap, QTransform
 
 from ebook_converter import fit_image, force_unicode
-from ebook_converter.constants import iswindows, plugins
+from ebook_converter.constants_old import iswindows, plugins
 from ebook_converter.ptempfile import TemporaryDirectory
 from ebook_converter.utils.config_base import tweaks
 from ebook_converter.utils.filenames import atomic_rename

ebook_converter/utils/ipc/__init__.py

@@ -5,10 +5,10 @@ import sys
 import threading
 
 from ebook_converter import force_unicode
-from ebook_converter.constants import filesystem_encoding
-from ebook_converter.constants import get_windows_username
-from ebook_converter.constants import islinux
-from ebook_converter.constants import iswindows
+from ebook_converter.constants_old import filesystem_encoding
+from ebook_converter.constants_old import get_windows_username
+from ebook_converter.constants_old import islinux
+from ebook_converter.constants_old import iswindows
 from ebook_converter.utils.filenames import ascii_filename
 
 

ebook_converter/utils/ipc/launch.py

@@ -1,7 +1,7 @@
 import subprocess, os, sys, time
 from functools import partial
 
-from ebook_converter.constants import isosx, isfrozen, filesystem_encoding
+from ebook_converter.constants_old 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

ebook_converter/utils/ipc/simple_worker.py

@@ -3,7 +3,7 @@ from multiprocessing.connection import Client
 from threading import Thread
 from contextlib import closing
 
-from ebook_converter.constants import iswindows
+from ebook_converter.constants_old import iswindows
 from ebook_converter.utils.ipc import eintr_retry_call
 from ebook_converter.utils.ipc.launch import Worker
 from ebook_converter.utils.serialize import msgpack_loads, msgpack_dumps

ebook_converter/utils/iso8601.py

@@ -2,7 +2,7 @@ from datetime import datetime
 
 from dateutil.tz import tzlocal, tzutc, tzoffset
 
-from ebook_converter.constants import plugins
+from ebook_converter.constants_old import plugins
 # speedup, err = plugins['speedup']
 # if not speedup:
     # raise RuntimeError(err)

ebook_converter/utils/lock.py

@@ -8,7 +8,7 @@ import tempfile
 import time
 from functools import partial
 
-from ebook_converter.constants import (
+from ebook_converter.constants_old import (
     __appname__, fcntl, filesystem_encoding, islinux, isosx, iswindows, plugins
 )
 from ebook_converter.utils.monotonic import monotonic
@@ -16,7 +16,7 @@ from ebook_converter.utils.monotonic import monotonic
 # speedup = plugins['speedup'][0]
 if iswindows:
     import msvcrt, win32file, pywintypes, winerror, win32api, win32event
-    from ebook_converter.constants import get_windows_username
+    from ebook_converter.constants_old import get_windows_username
     excl_file_mode = stat.S_IREAD | stat.S_IWRITE
 else:
     excl_file_mode = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH

ebook_converter/utils/monotonic.py

@@ -1,7 +1,7 @@
 try:
     from time import monotonic
 except ImportError:
-    from ebook_converter.constants import plugins
+    from ebook_converter.constants_old import plugins
 
     monotonicp, err = plugins['monotonic']
     if err:

ebook_converter/utils/shared_file.py

@@ -17,7 +17,7 @@ file before deleting it.
 import os, sys
 
 from ebook_converter.polyglot.builtins import reraise
-from ebook_converter.constants import iswindows, plugins
+from ebook_converter.constants_old import iswindows, plugins
 
 
 __license__ = 'GPL v3'