Fix recursive import #1059

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

src/extractcode/archive.py

@@ -34,7 +34,8 @@
 from commoncode import fileutils
 from commoncode import filetype
 from commoncode.system import on_linux
-import typecode
+
+from typecode import contenttype
 
 from extractcode import all_kinds
 from extractcode import regular
@@ -165,7 +166,8 @@ def get_handlers(location):
         location = fileutils.fsencode(location)
 
     if filetype.is_file(location):
-        T = typecode.contenttype.get_type(location)
+
+        T = contenttype.get_type(location)
         ftype = T.filetype_file.lower()
         mtype = T.mimetype_file
 

src/typecode/contenttype.py

@@ -46,8 +46,6 @@
 from commoncode import filetype
 from commoncode.system import on_linux
 
-from extractcode import archive
-
 from typecode import magic2
 from typecode import entropy
 
@@ -352,6 +350,8 @@ def is_archive(self):
             return self._is_archive
         self._is_archive = False
 
+        from extractcode import archive
+
         ft = self.filetype_file.lower()
         can_extract = bool(archive.can_extract(self.location))
         docx_ext = 'x' if on_linux else u'x'

tests/extractcode/test_extract.py

@@ -892,3 +892,6 @@ def test_extract_can_extract_to_relative_paths(self):
         for r in result:
             assert [] == r.warnings
             assert [] == r.errors
+
+    def test_recursive_import(self):
+        from extractcode.extract import extract  # NOQA