gryf/ebook-converter
1
0
Fork 0
mirror of https://github.com/gryf/ebook-converter.git synced 2026-03-15 14:13:40 +01:00
Code Issues Projects Releases Wiki Activity

Cut off cross importing things.

Browse Source 
There was (and perhaps it exists in other modules, need to check) a bad
habit of importing objects out of module A into B just to be able of
import those object from module B. In this case there was import from
module config_base into module config. This commit fix this.
This commit is contained in:
gryf
2020-09-06 18:23:05 +02:00
parent de22960d26
commit 6fdcc029bb
8 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ebook_converter/ebooks/metadata/meta.py
View File

@@ -1,6 +1,6 @@
import os, re, collections
from ebook_converter.utils.config import prefs
from ebook_converter.utils.config_base import prefs
from ebook_converter.constants_old import filesystem_encoding
from ebook_converter.ebooks.metadata.opf2 import OPF
from ebook_converter.customize.ui import get_file_type_metadata, set_file_type_metadata

6
ebook_converter/ebooks/metadata/opf2.py
View File

@@ -33,7 +33,7 @@ from ebook_converter.ebooks.metadata.book.base import Metadata
from ebook_converter.utils.date import parse_date, isoformat
from ebook_converter.utils.localization import get_lang, canonicalize_lang
from ebook_converter.utils.cleantext import clean_ascii_chars, clean_xml_chars
from ebook_converter.utils.config import tweaks
from ebook_converter.utils.config_base import tweaks
from ebook_converter.polyglot.urllib import unquote
@@ -504,7 +504,7 @@ class TitleSortField(MetadataField):
def serialize_user_metadata(metadata_elem, all_user_metadata,
tail='\n'+(' '*8)):
from ebook_converter.utils.config import to_json
from ebook_converter.utils.config_base import to_json
from ebook_converter.ebooks.metadata.book.json_codec import \
object_to_unicode, encode_is_multiple
@@ -654,7 +654,7 @@ class OPF(object): # {{{
def read_user_metadata(self):
self._user_metadata_ = {}
temp = Metadata('x', ['x'])
from ebook_converter.utils.config import from_json
from ebook_converter.utils.config_base import from_json
from ebook_converter.ebooks.metadata.book.json_codec import \
decode_is_multiple
elems = self.root.xpath('//*[name() = "meta" and starts-with(@name,'

2
ebook_converter/ebooks/metadata/opf3.py
View File

@@ -18,7 +18,7 @@ from ebook_converter.ebooks.metadata.utils import (
create_manifest_item, ensure_unique, normalize_languages, parse_opf,
pretty_print_opf
)
from ebook_converter.utils.config import from_json, to_json
from ebook_converter.utils.config_base import from_json, to_json
from ebook_converter.utils.date import (fix_only_date, is_date_undefined,
isoformat, parse_date as parse_date_,
utcnow, w3cdtf)

4
ebook_converter/ebooks/metadata/xmp.py
View File

@@ -173,7 +173,7 @@ def read_series(root):
def read_user_metadata(mi, root):
from ebook_converter.utils.config import from_json
from ebook_converter.utils.config_base import from_json
from ebook_converter.ebooks.metadata.book.json_codec import \
decode_is_multiple
fields = set()
@@ -452,7 +452,7 @@ def create_series(calibre, series, series_index):
def create_user_metadata(calibre, all_user_metadata):
from ebook_converter.utils.config import to_json
from ebook_converter.utils.config_base import to_json
from ebook_converter.ebooks.metadata.book.json_codec import \
object_to_unicode, encode_is_multiple