py: remove unnecessary globals

The github linter decided to become strict about unnecessary
globals (when variable isn't overwritten). Remove those.

Signed-off-by: Jakub Kicinski <[email protected]>

Author: kuba-moo

contest/backend/query.py

@@ -26,8 +26,6 @@ def hello():
 
 @app.route('/branches')
 def branches():
-    global psql
-
     with psql.cursor() as cur:
         cur.execute(f"SELECT branch, t_date, base, url FROM branches ORDER BY t_date DESC LIMIT 40")
         rows = [{"branch": r[0], "date": r[1].isoformat() + "+00:00", "base": r[2], "url": r[3]} for r in cur.fetchall()]
@@ -36,8 +34,6 @@ def branches():
 
 
 def branches_to_rows(br_cnt, remote, br_pfx=None):
-    global psql
-
     cnt = 0
     with psql.cursor() as cur:
         remote_k = ",remote" if remote else ""
@@ -77,8 +73,6 @@ def result_as_l2(raw):
 
 @app.route('/results')
 def results():
-    global psql
-
     limit = 0
     where = []
     log = ""
@@ -151,8 +145,6 @@ def results():
 
 @app.route('/remotes')
 def remotes():
-    global psql
-
     t1 = datetime.datetime.now()
 
     with psql.cursor() as cur:

core/lifetime.py

@@ -23,6 +23,7 @@ def sig_init():
 
     if not sig_initialized:
         signal.signal(signal.SIGUSR1, sig_handler)
+        sig_initialized = True
 
 
 def nipa_git_version():
@@ -55,8 +56,6 @@ def __init__(self, config):
         self._restart = False
 
     def next_poll(self, wait_time=None):
-        global got_sigusr1
-
         if self._first_run:
             self._first_run = False
             return True

core/logger.py

@@ -220,24 +220,16 @@ def log_init(name, path, force_single_thread=False):
 
 
 def log_fini():
-    global tls
-
     tls.logger.fini()
 
 
 def log_open_sec(header):
-    global tls
-
     tls.logger.open_sec(header)
 
 
 def log_end_sec():
-    global tls
-
     tls.logger.end_sec()
 
 
 def log(header, data=''):
-    global tls
-
     tls.logger.log(header, data)

mailbot.py

@@ -317,7 +317,6 @@ def _resolve_authorized(self, pw):
                 continue
             file_names.add(line[6:])
 
-        global maintainers
         maintainer_matches = maintainers.find_by_paths(file_names).find_by_owner(self.msg.get('From'))
         if len(maintainer_matches):
             self._authorized = repr(maintainer_matches)
@@ -340,7 +339,6 @@ def auto_awaiting_upstream(self):
             return False
         tags = subject[1:tags_end]
 
-        global auto_awaiting_upstream
         for designation in auto_awaiting_upstream:
             if designation in tags:
                 return True
@@ -538,7 +536,6 @@ def handler(signum, _):
 
 
 def pw_state_log(fields):
-    global config
     log_name = config.get('mailbot', 'change-log')
     if not log_name:
         return
@@ -551,8 +548,6 @@ def pw_state_log(fields):
 
 
 def weak_act_should_ignore(msg, series, want):
-    global pw_act_active
-
     if msg.user_authorized():
         return None
     current = series.state()
@@ -652,7 +647,6 @@ def do_mail_file(msg_path, pw, dr):
     try:
         do_mail(msg, pw, dr)
     except MlDelayActions as e:
-        global delay_actions
         msg.flush_actions()  # avoid duplicates, actions will get re-parsed
         delay_actions.append((e.when, msg, ))
 
@@ -717,15 +711,12 @@ def main():
     if ua:
         http_headers = {"user-agent":ua}
 
-    global authorized_users
     users = config.get('mailbot', 'authorized')
     authorized_users.update(set(users.split(',')))
 
-    global auto_changes_requested
     users = config.get('mailbot', 'error-bots')
     auto_changes_requested.update(set(users.split(',')))
 
-    global auto_awaiting_upstream
     users = config.get('mailbot', 'awaiting-upstream')
     auto_awaiting_upstream.update(set(users.split(',')))
 
@@ -746,7 +737,6 @@ def main():
     doc_load_time = datetime.datetime.fromtimestamp(0)
     dr = None
 
-    global should_stop
     while not should_stop:
         req_time = datetime.datetime.now()
 

pw_brancher.py

@@ -177,8 +177,6 @@ def apply_local_patches(config, tree) -> List:
 
 
 def db_insert(config, state, name):
-    global psql_conn
-
     # Branches usually have a trailing separator
     pfx = config.get("target", "branch_pfx")[:-1]
     pub_url = config.get('target', 'public_url')

pw_upload.py

@@ -166,8 +166,6 @@ def initial_scan(self):
             break
 
     def watch(self):
-        global should_stop
-
         if self.main_wd is None:
             raise Exception('Not initialized')
 

system-status.py

@@ -51,8 +51,6 @@ def pre_strip(line, needle):
 
 
 def add_one_tree(result, pfx, name):
-    global char_filter
-
     log_file = os.path.join(pfx, name)
     stat = os.stat(log_file)
 

tests/patch/cc_maintainers/test.py

@@ -116,8 +116,6 @@ def is_stale(self, e, since_months, dbg=None):
 
 
 def get_stale(sender_from, missing, out):
-    global stale_db
-
     sender_corp = None
     for corp in corp_suffix:
         if sender_from.endswith(corp):