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

Don't cross import symbols from __init__

Browse Source
This commit is contained in:
gryf
2020-09-30 19:06:42 +02:00
parent ee232b76d6
commit 97ddcd7be1
5 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ebook_converter/ebooks/lrf/html/convert_from.py
View File

@@ -20,9 +20,9 @@ import math
import bs4
from ebook_converter import __appname__, entity_to_unicode, fit_image, \
from ebook_converter import entity_to_unicode, fit_image, \
force_unicode
from ebook_converter.constants_old import filesystem_encoding, \
from ebook_converter.constants_old import __appname__, filesystem_encoding, \
preferred_encoding
from ebook_converter.devices.interface import DevicePlugin as Device
from ebook_converter.ebooks import ConversionError

2
ebook_converter/ebooks/lrf/pylrs/pylrs.py
View File

@@ -49,7 +49,7 @@ from ebook_converter.utils.date import isoformat
DEFAULT_SOURCE_ENCODING = "cp1252" # default is us-windows character set
DEFAULT_GENREADING = "fs" # default is yes to both lrf and lrs
from ebook_converter import __appname__, __version__
from ebook_converter.constants_old import __appname__, __version__
from ebook_converter import entity_to_unicode

4
ebook_converter/ebooks/oeb/polish/toc.py
View File

@@ -8,8 +8,8 @@ import urllib.parse
from lxml import etree
from lxml.builder import ElementMaker
from ebook_converter import __version__
from ebook_converter import constants as const
from ebook_converter import constants_old
from ebook_converter.ebooks.oeb import base
from ebook_converter.ebooks.oeb.polish.errors import MalformedMarkup
from ebook_converter.ebooks.oeb.polish.utils import guess_type, extract
@@ -608,7 +608,7 @@ def create_ncx(toc, to_href, btitle, lang, uid):
name='dtb:uid', content=str(uid))
etree.SubElement(head, base.tag('ncx', 'meta'),
name='dtb:depth', content=str(toc.depth))
generator = ''.join(['calibre (', __version__, ')'])
generator = ''.join(['calibre (', constants_old.__version__, ')'])
etree.SubElement(head, base.tag('ncx', 'meta'),
name='dtb:generator', content=generator)
etree.SubElement(head, base.tag('ncx', 'meta'), name='dtb:totalPageCount',