Correct F824 lint

Author: langmm

yggdrasil/communication/CommBase.py

@@ -173,7 +173,6 @@ def is_registered(commtype, key):
         key (str): Key that should be checked.
 
     """
-    global _registered_comms
     with _registered_comms.lock:
         if commtype not in _registered_comms:
             return False
@@ -207,7 +206,6 @@ def register_comm(commtype, key, value):
         value (obj): Object being registered.
 
     """
-    global _registered_comms
     with _registered_comms.lock:
         if commtype not in _registered_comms:
             _registered_comms.add_subdict(commtype)
@@ -228,7 +226,6 @@ def unregister_comm(commtype, key, dont_close=False):
         bool: True if an object was closed.
 
     """
-    global _registered_comms
     with _registered_comms.lock:
         if commtype not in _registered_comms:
             return False
@@ -255,7 +252,6 @@ def cleanup_comms(commtype, close_func=None):
     count = 0
     # if commtype is None:
     #     return count
-    global _registered_comms
     with _registered_comms.lock:
         if commtype in _registered_comms:
             keys = list(_registered_comms[commtype].keys())
@@ -346,7 +342,6 @@ class CommProxy(multitasking.YggTaskLoop):
     def __init__(self, srv_address=None, cli_address=None, name=None,
                  allow_no_servers=False, allow_no_clients=False,
                  is_partner=False, **kwargs):
-        global _registered_proxies
         self.servers = []
         self.clients = []
         self.is_partner = is_partner
@@ -628,7 +623,6 @@ def remove_server(self, name, in_loop=False, messages=None):
                 pass
             self.terminate()
             return
-        global _registered_proxies
         self.servers.remove(name)
         if self.srv_count == 0 and not self.allow_no_servers:
             self.debug(f"Shutting down proxy due to absence of "
@@ -653,7 +647,6 @@ def remove_client(self, name, in_loop=False):
                              + name.encode('utf-8'))
             self.terminate()
             return
-        global _registered_proxies
         self.debug(f"Removing client \"{name}\" from proxy")
         self.clients.remove(name)
         if (not self.allow_no_clients) and self.cli_count == 0:
@@ -2221,7 +2214,6 @@ def precheck(self, direction):
     # CLIENT/SERVER METHODS
     def signon_to_proxy(self):
         r"""Add a client/server to an existing proxy or create one."""
-        global _registered_proxies
         with _registered_proxies.lock:
             if self.proxy is not None:
                 return
@@ -2258,7 +2250,6 @@ def signon_to_proxy(self):
 
     def signoff_from_proxy(self, **kwargs):
         r"""Remove a client/server from the proxy."""
-        global _registered_proxies
         with _registered_proxies.lock:
             if self.proxy is None:
                 return

yggdrasil/communication/__init__.py

@@ -35,7 +35,6 @@ def __init__(self, msg, max_consecutive_allowed=None,
         super(TemporaryCommunicationError, self).__init__(msg, **kwargs)
         self.max_consecutive_allowed = max_consecutive_allowed
         if max_consecutive_allowed is not None:
-            global _temp_error_registry
             assert registry_key is not None
             _temp_error_registry.setdefault(registry_key, 0)
             _temp_error_registry[registry_key] += 1
@@ -46,7 +45,6 @@ def __init__(self, msg, max_consecutive_allowed=None,
     @classmethod
     def reset(cls, registry_key):
         r"""Reset the registry for a TemporaryCommunicationError."""
-        global _temp_error_registry
         _temp_error_registry.pop(registry_key, None)
 
 

yggdrasil/components.py

@@ -99,7 +99,6 @@ def registering(recurse=False):
 def init_registry(recurse=False):
     r"""Initialize the registries and schema."""
     from yggdrasil.tools import import_all_modules
-    global _registry
     global _registry_complete
     with registering(recurse=recurse):
         import_all_modules(exclude=['yggdrasil.examples',
@@ -120,7 +119,6 @@ def get_registry(comptype=None):
             returned.
 
     """
-    global _registry
     if registration_in_progress():
         out = _registry
     else:
@@ -456,7 +454,6 @@ def __new__(meta, name, bases, class_dict):
                             f"from {bases}.")
                     cls._schema_base_class = base_comp
             # Register
-            global _registry
             yaml_typ = cls._schema_type
             default_subtype = cls._schema_properties.get(
                 cls._schema_subtype_key, {}).get('default',

yggdrasil/drivers/CompiledModelDriver.py

@@ -735,7 +735,6 @@ def get_tool_registry(languages=None):
         CompilationToolRegistry: Global tool registry.
     
     """
-    global _tool_registry
     if languages:
         _tool_registry._init_languages(languages)
     return _tool_registry
@@ -2338,7 +2337,6 @@ def locate_tool(self, tooltype, toolname):
             else:
                 language = self.parameters.get(f"{tooltype0}_language",
                                                self.language)
-                global _tool_registry
                 out = _tool_registry.tool_instance(
                     tooltype0, language=language,
                     driver=self.parent_driver,
@@ -2925,7 +2923,6 @@ def generate(self, filetype=None, overwrite=False, **kwargs):
                 language, tooltype = filetype.split('_', 1)
                 out = self.get(tooltype, **kwargs)
                 if (not out) or (language not in out.languages):
-                    global _tool_registry
                     out = _tool_registry.tool_instance(
                         tooltype, language=language,
                         compatible_with=self.basetool,
@@ -3379,7 +3376,6 @@ def tool_parameters_class(cls, tool):
             return []
         out = ['working_dir']
         if isinstance(tool, str):
-            global _tool_registry
             tool = _tool_registry._bases[tool]
         out += list(tool.flag_options.keys())
         out += tool.build_params
@@ -4090,7 +4086,6 @@ class CompilationToolMeta(type):
     r"""Meta class for registering compilers."""
     def __new__(meta, name, bases, class_dict):
         cls = type.__new__(meta, name, bases, class_dict)
-        global _tool_registry
         _tool_registry.register(cls)
         return cls
 
@@ -4379,7 +4374,6 @@ def before_registration(cls):
             stage_name = f"{stage_base}{stage_type.title()}"
             for k in copy_attr:
                 stage_attr.setdefault(k, getattr(cls, k))
-            global _tool_registry
             base_cls = cls.create_next_stage_tool.get(
                 'base_classes', (_tool_registry._bases[stage_type], ))
             stage_cls = type(stage_name, base_cls, stage_attr)
@@ -4415,7 +4409,6 @@ def get_tool(cls, tooltype, allow_uninstalled=False,
             CompilationToolBase: Tool class associated with this compiler.
 
         """
-        global _tool_registry
         if ((tooltype == cls.tooltype
              and kwargs.get('language', None) in cls.languages
              and _tool_registry._matches(cls, **kwargs))):
@@ -4636,7 +4629,6 @@ def get_alternate_class(cls, toolname=None, language=None):
                 to the provided toolname.
 
         """
-        global _tool_registry
         if (language is not None) and (language not in cls.languages):
             if toolname is None:
                 toolname = cls.toolname
@@ -4989,7 +4981,6 @@ def get_default_libtype(cls, no_additional_stages=False):
             str: Product file type.
 
         """
-        global _tool_registry
         if no_additional_stages or not cls.builtin_next_stage:
             return cls.default_libtype
         return _tool_registry._bases[cls.builtin_next_stage].default_libtype
@@ -6602,7 +6593,6 @@ def before_registration(cls):
         to registration including things like platform dependent properties and
         checking environment variables for default settings.
         """
-        global _tool_registry
         if not cls.tooltypes:
             cls.tooltypes = _tool_registry.tooltypes(cls.basetool)
             cls._config_keys = cls.tooltypes
@@ -6642,7 +6632,6 @@ def after_registration(cls, **kwargs):
         option for the language, followed by the environment variable set by
         _compiler_env, followed by the existing class attribute.
         """
-        global _tool_registry
         ModelDriver.after_registration(cls, **kwargs)
         for k in cls.tooltypes:
             # Set default linker/archiver based on compiler
@@ -6846,7 +6835,6 @@ def get_available_tools(cls, tooltype):
             dict: Registry of tools for this language.
 
         """
-        global _tool_registry
         if tooltype == 'basetool':
             tooltype = cls.basetool
         reg = _tool_registry.language[tooltype].get(cls.language,
@@ -6886,7 +6874,6 @@ def get_tool_static(cls, tooltype, toolname=None, return_prop='tool',
             ValueError: If return_prop is not 'tool', 'name', or 'flags'.
 
         """
-        global _tool_registry
         if return_prop == 'tool':
             return _tool_registry.tool_instance(
                 tooltype, toolname=toolname, language=language,
@@ -7171,7 +7158,6 @@ def configure(cls, cfg, **kwargs):
                 be set.
 
         """
-        global _tool_registry
         if (cls.language is not None) and (not cfg.has_section(cls.language)):
             cfg.add_section(cls.language)
         for k, v in kwargs.items():
@@ -7219,7 +7205,6 @@ def configure_executable_type(cls, cfg):
                 be set.
 
         """
-        global _tool_registry
         out = super(CompiledModelDriver, cls).configure_executable_type(cfg)
         for k in cls.tooltypes:
             default_tool_name = _tool_registry.toolname(

yggdrasil/drivers/ModelDriver.py

@@ -171,7 +171,6 @@ def find(self, fname, **kwargs):
                 if self._is_global:
                     self.insert(fname, **kwargs)
                 else:
-                    global _file_locks
                     self[fname] = _file_locks.find(fname, **kwargs)
             return self[fname]
 

yggdrasil/metaschema/datatypes/conversions.py

@@ -15,7 +15,6 @@ def register_conversion(from_type, to_type):
         function: Decorator that will register the conversion.
 
     """
-    global _conversion_registry
     key = (from_type, to_type)
     if key in _conversion_registry:
         raise ValueError("Conversion '%s' to '%s' already in registry." % key)

yggdrasil/multitasking.py

@@ -41,7 +41,6 @@ def on_mpi():
 
     """
     init_mpi()
-    global _on_mpi
     return _on_mpi
 
 
@@ -1489,8 +1488,6 @@ def __init__(self, name=None, target=None, args=(), kwargs=None,
         self.disabled = disabled
         super(YggTask, self).__init__(name, **ygg_kwargs)
         if not self.as_process:
-            global _thread_registry
-            global _lock_registry
             _thread_registry[self.name] = self.process_instance._base
             _lock_registry[self.name] = self.lock._base
             atexit.register(self.atexit)

yggdrasil/schema.py

@@ -120,7 +120,6 @@ def get_schema(fname=None):
         dict: yggdrasil YAML options.
 
     """
-    global _schema
     if fname is None:
         init_schema()
         out = _schema

yggdrasil/tools.py

@@ -500,13 +500,11 @@ def update_environ(env, exclusive=False):
 
 def cache_environ():
     r"""Cache the current environment variables."""
-    global _environ_cache
     _environ_cache.append(copy.deepcopy(os.environ))
 
 
 def restored_cached_environ():
     r"""Restore the last set of cached environment variables."""
-    global _environ_cache
     oldenv = _environ_cache.pop()
     update_environ(oldenv, exclusive=True)