Changing logging module location.

ebook_converter/ebooks/docx/container.py

@@ -12,10 +12,13 @@ from ebook_converter.ebooks.docx import InvalidDOCX
 from ebook_converter.ebooks.docx.names import DOCXNamespace
 from ebook_converter.ptempfile import PersistentTemporaryDirectory
 from ebook_converter.utils.localization import canonicalize_lang
-from ebook_converter.utils.logging import default_log
+from ebook_converter import logging
 from ebook_converter.utils.zipfile import ZipFile
 
 
+LOG = logging.default_log
+
+
 # Read metadata {{{
 def read_doc_props(raw, mi, XPath):
     root = etree.fromstring(raw)
@@ -86,7 +89,7 @@ class DOCX(object):
         if not hasattr(path_or_stream, 'read'):
             stream = open(path_or_stream, 'rb')
         self.name = getattr(stream, 'name', None) or '<stream>'
-        self.log = log or default_log
+        self.log = log or LOG
         if extract:
             self.extract(stream)
         else:

ebook_converter/ebooks/docx/to_html.py

@@ -881,10 +881,11 @@ class Convert(object):
 
 if __name__ == '__main__':
     import shutil
-    from ebook_converter.utils.logging import default_log
-    default_log.filter_level = default_log.DEBUG
+    from ebook_converter import logging
+    logging.default_log.filter_level = logging.default_log.DEBUG
     dest_dir = os.path.join(os.getcwd(), 'docx_input')
     if os.path.exists(dest_dir):
         shutil.rmtree(dest_dir)
     os.mkdir(dest_dir)
-    Convert(sys.argv[-1], dest_dir=dest_dir, log=default_log)()
+    Convert(sys.argv[-1], dest_dir=dest_dir,
+            log=logging.default_log)()