fix parser import by python path

Author: submarcos

geotrek/common/management/commands/import.py

@@ -24,17 +24,20 @@ def handle(self, *args, **options):
 
         if '.' in options['parser']:
             # Python import syntax
-            Parser = import_string(options['parser'])
+            try:
+                Parser = import_string(options['parser'])
+            except Exception:
+                raise CommandError("Failed to import parser class '{0}'".format(options['parser']))
         else:
             # just a class name
-            module_path = join(settings.VAR_DIR, 'conf/parsers.py')
-            module_name = 'parsers'
-            class_name = options['parser']
-            spec = importlib.util.spec_from_file_location(module_name, module_path)
-            module = importlib.util.module_from_spec(spec)
-            Parser = getattr(module, class_name)
             try:
+                module_path = join(settings.VAR_DIR, 'conf/parsers.py')
+                module_name = 'parsers'
+                class_name = options['parser']
+                spec = importlib.util.spec_from_file_location(module_name, module_path)
+                module = importlib.util.module_from_spec(spec)
                 spec.loader.exec_module(module)
+                Parser = getattr(module, class_name)
             except FileNotFoundError:
                 raise CommandError("Failed to import parser file '{0}'".format(module_path))
 

geotrek/common/tests/test_parsers.py

@@ -91,12 +91,12 @@ def filter_attachments(self, src, val):
 
 class ParserTests(TestCase):
     def test_bad_parser_class(self):
-        with self.assertRaisesRegex(CommandError, "Failed to import parser class 'DoesNotExist'"):
+        with self.assertRaisesRegex(Exception, "Failed to import parser class 'geotrek.common.tests.test_parsers.DoesNotExist'"):
             call_command('import', 'geotrek.common.tests.test_parsers.DoesNotExist', '', verbosity=0)
 
     def test_bad_parser_file(self):
-        with self.assertRaisesRegex(CommandError, "Failed to import parser file 'geotrek/common.py'"):
-            call_command('import', 'geotrek.common.DoesNotExist', '', verbosity=0)
+        with self.assertRaisesRegex(Exception, "module 'parsers' has no attribute 'DoesNotExist'"):
+            call_command('import', 'DoesNotExist', '', verbosity=0)
 
     def test_no_filename_no_url(self):
         with self.assertRaisesRegex(CommandError, "File path missing"):