Refactor plugin loading handler existence checks

Author: itisFarzin

pyrogram/client.py

@@ -895,18 +895,16 @@ def load_plugins(self):
                     module = import_module(module_path)
 
                     for name in vars(module).keys():
-                        # noinspection PyBroadException
-                        try:
-                            for handler, group in getattr(module, name).handlers:
+                        target_attr = getattr(module, name)
+                        if hasattr(target_attr, "handlers"):
+                            for handler, group in target_attr.handlers:
                                 if isinstance(handler, Handler) and isinstance(group, int):
                                     self.add_handler(handler, group)
 
                                     log.info('[{}] [LOAD] {}("{}") in group {} from "{}"'.format(
                                         self.name, type(handler).__name__, name, group, module_path))
 
                                     count += 1
-                        except Exception:
-                            pass
             else:
                 for path, handlers in include:
                     module_path = root + "." + path
@@ -927,20 +925,19 @@ def load_plugins(self):
                         warn_non_existent_functions = False
 
                     for name in handlers:
-                        # noinspection PyBroadException
-                        try:
-                            for handler, group in getattr(module, name).handlers:
+                        target_attr = getattr(module, name)
+                        if hasattr(target_attr, "handlers"):
+                            for handler, group in target_attr.handlers:
                                 if isinstance(handler, Handler) and isinstance(group, int):
                                     self.add_handler(handler, group)
 
                                     log.info('[{}] [LOAD] {}("{}") in group {} from "{}"'.format(
                                         self.name, type(handler).__name__, name, group, module_path))
 
                                     count += 1
-                        except Exception:
-                            if warn_non_existent_functions:
-                                log.warning('[{}] [LOAD] Ignoring non-existent function "{}" from "{}"'.format(
-                                    self.name, name, module_path))
+                        elif warn_non_existent_functions:
+                            log.warning('[{}] [LOAD] Ignoring non-existent function "{}" from "{}"'.format(
+                                self.name, name, module_path))
 
             if exclude:
                 for path, handlers in exclude:
@@ -962,20 +959,19 @@ def load_plugins(self):
                         warn_non_existent_functions = False
 
                     for name in handlers:
-                        # noinspection PyBroadException
-                        try:
-                            for handler, group in getattr(module, name).handlers:
+                        target_attr = getattr(module, name)
+                        if hasattr(target_attr, "handlers"):
+                            for handler, group in target_attr.handlers:
                                 if isinstance(handler, Handler) and isinstance(group, int):
                                     self.remove_handler(handler, group)
 
                                     log.info('[{}] [UNLOAD] {}("{}") from group {} in "{}"'.format(
                                         self.name, type(handler).__name__, name, group, module_path))
 
                                     count -= 1
-                        except Exception:
-                            if warn_non_existent_functions:
-                                log.warning('[{}] [UNLOAD] Ignoring non-existent function "{}" from "{}"'.format(
-                                    self.name, name, module_path))
+                        elif warn_non_existent_functions:
+                            log.warning('[{}] [UNLOAD] Ignoring non-existent function "{}" from "{}"'.format(
+                                self.name, name, module_path))
 
             if count > 0:
                 log.info('[{}] Successfully loaded {} plugin{} from "{}"'.format(