Remove grab.util.module::build_grab_instance function

lorien · Feb 25, 2022 · 4c41bae · 4c41bae
1 parent 0af0dea
commit 4c41bae
Showing 1 changed file with 18 additions and 20 deletions.
diff --git a/grab/util/module.py b/grab/util/module.py
@@ -6,28 +6,28 @@
 from grab.util.config import build_root_config, build_spider_config
 
 SPIDER_REGISTRY = {}
-logger = logging.getLogger('grab.util.module') # pylint: disable=invalid-name
+logger = logging.getLogger("grab.util.module")  # pylint: disable=invalid-name
 
 
 def build_spider_registry(config):
     SPIDER_REGISTRY.clear()
 
     opt_modules = []
-    opt_modules = config['global'].get('spider_modules', [])
+    opt_modules = config["global"].get("spider_modules", [])
 
     for path in opt_modules:
-        if ':' in path:
-            path, cls_name = path.split(':')
+        if ":" in path:
+            path, cls_name = path.split(":")
         else:
             cls_name = None
         try:
-            mod = __import__(path, None, None, ['foo'])
+            mod = __import__(path, None, None, ["foo"])
         except ImportError as ex:
             if path not in six.text_type(ex):
-                logger.error('', exc_info=ex)
+                logger.error("", exc_info=ex)
         else:
             for key in dir(mod):
-                if key == 'Spider':
+                if key == "Spider":
                     continue
                 if cls_name is None or key == cls_name:
                     val = getattr(mod, key)
@@ -36,16 +36,20 @@ def build_spider_registry(config):
                             pass
                         else:
                             spider_name = val.get_spider_name()
-                            logger.debug('Module `%s`, found spider `%s` '
-                                         'with name `%s`',
-                                         path, val.__name__, spider_name)
+                            logger.debug(
+                                "Module `%s`, found spider `%s` " "with name `%s`",
+                                path,
+                                val.__name__,
+                                spider_name,
+                            )
                             if spider_name in SPIDER_REGISTRY:
                                 mod = SPIDER_REGISTRY[spider_name].__module__
                                 raise SpiderInternalError(
-                                    'There are two different spiders with '
+                                    "There are two different spiders with "
                                     'the same name "%s". '
-                                    'Modules: %s and %s' % (
-                                        spider_name, mod, val.__module__))
+                                    "Modules: %s and %s"
+                                    % (spider_name, mod, val.__module__)
+                                )
                             else:
                                 SPIDER_REGISTRY[spider_name] = val
     return SPIDER_REGISTRY
@@ -55,12 +59,6 @@ def load_spider_class(config, spider_name):
     if not SPIDER_REGISTRY:
         build_spider_registry(config)
     if spider_name not in SPIDER_REGISTRY:
-        raise SpiderInternalError('Unknown spider: %s' % spider_name)
+        raise SpiderInternalError("Unknown spider: %s" % spider_name)
     else:
         return SPIDER_REGISTRY[spider_name]
-
-
-def build_spider_instance(cls, settings_module):
-    root_config = build_root_config(settings_module)
-    spider_config = build_spider_config(cls, root_config)
-    return cls(config=spider_config)