From f4c23c41e7500f4c4f46fb81a0cfffe54f2f7a08 Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Thu, 16 Jul 2020 15:46:51 +0200 Subject: [PATCH] Update exception catching syntax to please pep8 --- django/archives/mailarchives/api.py | 2 +- django/archives/mailarchives/models.py | 2 +- django/archives/mailarchives/views.py | 2 +- loader/generate_mbox.py | 4 ++-- loader/hide_message.py | 4 ++-- loader/lib/parser.py | 10 +++++----- loader/pglister_sync.py | 2 +- loader/purge_frontend_message.py | 2 +- loader/reparse_message.py | 2 +- loader/tools/edit_raw.py | 4 ++-- loader/tools/fix_from.py | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/django/archives/mailarchives/api.py b/django/archives/mailarchives/api.py index 4afb7f1..4209811 100644 --- a/django/archives/mailarchives/api.py +++ b/django/archives/mailarchives/api.py @@ -41,7 +41,7 @@ def latest(request, listname): if 'n' in request.GET: try: limit = int(request.GET['n']) - except: + except Exception: limit = 0 else: limit = 50 diff --git a/django/archives/mailarchives/models.py b/django/archives/mailarchives/models.py index 5eeb2cb..fd9a017 100644 --- a/django/archives/mailarchives/models.py +++ b/django/archives/mailarchives/models.py @@ -56,7 +56,7 @@ class Message(models.Model): return None try: return hide_reasons[self.hiddenstatus] - except: + except Exception: # Weird value return 'This message has been hidden.' diff --git a/django/archives/mailarchives/views.py b/django/archives/mailarchives/views.py index 82e8cef..aba82f5 100644 --- a/django/archives/mailarchives/views.py +++ b/django/archives/mailarchives/views.py @@ -720,7 +720,7 @@ def search(request): 'names': request.POST['ln'].split(','), }) lists = [x for x, in curs.fetchall()] - except: + except Exception: # If failing to parse list of lists, just search all lists = None else: diff --git a/loader/generate_mbox.py b/loader/generate_mbox.py index dfb8d3d..76ce946 100755 --- a/loader/generate_mbox.py +++ b/loader/generate_mbox.py @@ -35,7 +35,7 @@ def generate_single_mbox(conn, listid, year, month, destination): try: x = msg.as_string(unixfrom=True) f.write(x) - except UnicodeEncodeError as e: + except UnicodeEncodeError: print("Not including {0}, unicode error".format(msg['message-id'])) except Exception as e: print("Not including {0}, exception {1}".format(msg['message-id'], e)) @@ -69,7 +69,7 @@ if __name__ == "__main__": cfg.read(os.path.join(os.path.realpath(os.path.dirname(sys.argv[0])), 'archives.ini')) try: connstr = cfg.get('db', 'connstr') - except: + except Exception: connstr = 'need_connstr' conn = psycopg2.connect(connstr) diff --git a/loader/hide_message.py b/loader/hide_message.py index 4a4d10a..62ac1c9 100755 --- a/loader/hide_message.py +++ b/loader/hide_message.py @@ -42,7 +42,7 @@ if __name__ == "__main__": cfg.read('%s/archives.ini' % os.path.realpath(os.path.dirname(sys.argv[0]))) try: connstr = cfg.get('db', 'connstr') - except: + except Exception: connstr = 'need_connstr' conn = psycopg2.connect(connstr) @@ -75,7 +75,7 @@ if __name__ == "__main__": else: try: print("Hiding message for reason: %s" % reasons[reason]) - except: + except Exception: continue break if previous == reason: diff --git a/loader/lib/parser.py b/loader/lib/parser.py index b9caace..5a02cb4 100644 --- a/loader/lib/parser.py +++ b/loader/lib/parser.py @@ -30,7 +30,7 @@ class ArchivesParser(object): try: if self.clean_messageid(self.decode_mime_header(self.get_mandatory('Message-ID'))) == msgid: return True - except Exception as e: + except Exception: return False def analyze(self, date_override=None): @@ -527,7 +527,7 @@ class ArchivesParser(object): try: return " ".join([self._maybe_decode(s, charset) for s, charset in decode_header(hdr)]) - except HeaderParseError as e: + except HeaderParseError: # Parser error is typically someone specifying an encoding, # but then not actually using that encoding. We'll do the best # we can, which is cut it down to ascii and ignore errors @@ -553,13 +553,13 @@ class ArchivesParser(object): if x is None: raise Exception() return x - except: + except Exception: raise IgnorableException("Mandatory field '%s' is missing" % fieldname) def get_optional(self, fieldname): try: return self.msg[fieldname] - except: + except Exception: return '' def html_clean(self, html): @@ -585,7 +585,7 @@ class ArchivesParser(object): cleaner = HTMLCleaner() cleaner.feed(html) return cleaner.get_text() - except Exception as e: + except Exception: # Failed to parse the html, thus failed to clean it. so we must # give up... return None diff --git a/loader/pglister_sync.py b/loader/pglister_sync.py index b1944a7..f95d369 100755 --- a/loader/pglister_sync.py +++ b/loader/pglister_sync.py @@ -20,7 +20,7 @@ if __name__ == "__main__": cfg.read('%s/archives.ini' % os.path.realpath(os.path.dirname(sys.argv[0]))) try: connstr = cfg.get('db', 'connstr') - except: + except Exception: connstr = 'need_connstr' if cfg.has_option('pglister', 'subscribers') and cfg.getint('pglister', 'subscribers'): diff --git a/loader/purge_frontend_message.py b/loader/purge_frontend_message.py index 3a87005..6f051b7 100755 --- a/loader/purge_frontend_message.py +++ b/loader/purge_frontend_message.py @@ -34,7 +34,7 @@ if __name__ == "__main__": cfg.read('%s/archives.ini' % os.path.realpath(os.path.dirname(sys.argv[0]))) try: connstr = cfg.get('db', 'connstr') - except: + except Exception: connstr = 'need_connstr' conn = psycopg2.connect(connstr) diff --git a/loader/reparse_message.py b/loader/reparse_message.py index 542e84a..52afe2f 100755 --- a/loader/reparse_message.py +++ b/loader/reparse_message.py @@ -64,7 +64,7 @@ if __name__ == "__main__": cfg.read('%s/archives.ini' % os.path.realpath(os.path.dirname(sys.argv[0]))) try: connstr = cfg.get('db', 'connstr') - except: + except Exception: connstr = 'need_connstr' conn = psycopg2.connect(connstr) diff --git a/loader/tools/edit_raw.py b/loader/tools/edit_raw.py index 5387af4..13e98c1 100755 --- a/loader/tools/edit_raw.py +++ b/loader/tools/edit_raw.py @@ -32,7 +32,7 @@ if __name__ == "__main__": cfg.read('%s/../archives.ini' % os.path.realpath(os.path.dirname(sys.argv[0]))) try: connstr = cfg.get('db', 'connstr') - except: + except Exception: connstr = 'need_connstr' conn = psycopg2.connect(connstr) @@ -92,6 +92,6 @@ if __name__ == "__main__": finally: try: f.close() - except: + except Exception: pass os.unlink(f.name) diff --git a/loader/tools/fix_from.py b/loader/tools/fix_from.py index d262546..52efec9 100755 --- a/loader/tools/fix_from.py +++ b/loader/tools/fix_from.py @@ -18,7 +18,7 @@ if __name__ == "__main__": cfg.read('%s/../archives.ini' % os.path.realpath(os.path.dirname(sys.argv[0]))) try: connstr = cfg.get('db', 'connstr') - except: + except Exception: connstr = 'need_connstr' conn = psycopg2.connect(connstr) -- 2.39.5