diff --git a/ebook_converter/ebooks/htmlz/oeb2html.py b/ebook_converter/ebooks/htmlz/oeb2html.py index 9684723..d2aebe6 100644 --- a/ebook_converter/ebooks/htmlz/oeb2html.py +++ b/ebook_converter/ebooks/htmlz/oeb2html.py @@ -16,13 +16,13 @@ import re from functools import partial from lxml import html -from calibre import prepare_string_for_xml -from calibre.ebooks.oeb.base import ( +from ebook_converter import prepare_string_for_xml +from ebook_converter.ebooks.oeb.base import ( XHTML, XHTML_NS, SVG_NS, barename, namespace, OEB_IMAGES, XLINK, rewrite_links, urlnormalize) -from calibre.ebooks.oeb.stylizer import Stylizer -from calibre.utils.logging import default_log -from polyglot.builtins import unicode_type, string_or_bytes, as_bytes -from polyglot.urllib import urldefrag +from ebook_converter.ebooks.oeb.stylizer import Stylizer +from ebook_converter.utils.logging import default_log +from ebook_converter.polyglot.builtins import unicode_type, string_or_bytes, as_bytes +from ebook_converter.polyglot.urllib import urldefrag SELF_CLOSING_TAGS = {'area', 'base', 'basefont', 'br', 'hr', 'input', 'img', 'link', 'meta'} diff --git a/ebook_converter/startup.py b/ebook_converter/startup.py index beb9bf8..efc54dc 100644 --- a/ebook_converter/startup.py +++ b/ebook_converter/startup.py @@ -200,10 +200,10 @@ if not _run_once: builtins.__dict__['lopen'] = local_open - from ebook_converter.utils.icu import title_case, lower as icu_lower, upper as icu_upper + from ebook_converter.utils.icu import lower as icu_lower, upper as icu_upper builtins.__dict__['icu_lower'] = icu_lower builtins.__dict__['icu_upper'] = icu_upper - builtins.__dict__['icu_title'] = title_case + builtins.__dict__['icu_title'] = lambda s: ' '.join([x.capitalize() for x in s.split(' ')]) def connect_lambda(bound_signal, self, func, **kw): import weakref