From 97ddcd7be1d6db19475ac5eed337c804e907bf71 Mon Sep 17 00:00:00 2001
From: gryf <gryf73@gmail.com>
Date: Wed, 30 Sep 2020 19:06:42 +0200
Subject: [PATCH] Don't cross import symbols from __init__

---
 ebook_converter/__init__.py                   |  8 --------
 .../ebooks/lrf/html/convert_from.py           |  4 ++--
 ebook_converter/ebooks/lrf/pylrs/pylrs.py     |  2 +-
 ebook_converter/ebooks/oeb/polish/toc.py      |  4 ++--
 ebook_converter/utils/resources.py            | 19 +++++++------------
 5 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/ebook_converter/__init__.py b/ebook_converter/__init__.py
index e4f3e23..0151c81 100644
--- a/ebook_converter/__init__.py
+++ b/ebook_converter/__init__.py
@@ -8,17 +8,9 @@ import re
 from functools import partial
 
 from ebook_converter import constants_old
-from ebook_converter.constants_old import \
-    __appname__, __version__, __author__, \
-    config_dir
 from ebook_converter.ebooks.html_entities import html5_entities
 
 
-if False:
-    # Prevent pyflakes from complaining
-    __appname__, __version__, __author__, config_dir
-
-
 def init_mimetypes():
     mimetypes.init([pkg_resources.resource_filename('ebook_converter',
                                                     'data/mime.types')])
diff --git a/ebook_converter/ebooks/lrf/html/convert_from.py b/ebook_converter/ebooks/lrf/html/convert_from.py
index dacd773..71e3a79 100644
--- a/ebook_converter/ebooks/lrf/html/convert_from.py
+++ b/ebook_converter/ebooks/lrf/html/convert_from.py
@@ -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
diff --git a/ebook_converter/ebooks/lrf/pylrs/pylrs.py b/ebook_converter/ebooks/lrf/pylrs/pylrs.py
index 20e6f0f..bb30f9d 100644
--- a/ebook_converter/ebooks/lrf/pylrs/pylrs.py
+++ b/ebook_converter/ebooks/lrf/pylrs/pylrs.py
@@ -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
 
 
diff --git a/ebook_converter/ebooks/oeb/polish/toc.py b/ebook_converter/ebooks/oeb/polish/toc.py
index 42af230..6bc05fe 100644
--- a/ebook_converter/ebooks/oeb/polish/toc.py
+++ b/ebook_converter/ebooks/oeb/polish/toc.py
@@ -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',
diff --git a/ebook_converter/utils/resources.py b/ebook_converter/utils/resources.py
index c5aa025..26549da 100644
--- a/ebook_converter/utils/resources.py
+++ b/ebook_converter/utils/resources.py
@@ -1,14 +1,10 @@
-__license__ = 'GPL v3'
-__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
-__docformat__ = 'restructuredtext en'
+import os
+import sys
+
+from ebook_converter import constants_old
 
 
-import sys, os
-
-from ebook_converter import config_dir
-
-
-user_dir = os.path.join(config_dir, 'resources')
+user_dir = os.path.join(constants_old.config_dir, 'resources')
 
 
 class PathResolver(object):
@@ -22,9 +18,8 @@ class PathResolver(object):
             try:
                 return os.path.exists(path) and os.path.isdir(path) and \
                        os.listdir(path)
-            except:
-                pass
-            return False
+            except Exception:
+                return False
 
         self.default_path = sys.resources_location