From 99c3dde795138a83328efc51bcef0c516adbfbbc Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Wed, 30 Nov 2022 13:12:51 +0100 Subject: [PATCH 1/2] rm compat for flake8 2.x --- flake8_copyright.py | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/flake8_copyright.py b/flake8_copyright.py index e7d3df3..5f798bd 100644 --- a/flake8_copyright.py +++ b/flake8_copyright.py @@ -22,22 +22,6 @@ __version__ = '0.2.3' -# Temporary shim for flake8 2.x --> 3.x transition -# http://flake8.pycqa.org/en/latest/plugin-development/cross-compatibility.html#option-handling-on-flake8-2-and-3 -def register_opt(parser, *args, **kwargs): - try: - # Flake8 3.x registration - parser.add_option(*args, **kwargs) - except (optparse.OptionError, TypeError): - # Flake8 2.x registration - parse_from_config = kwargs.pop('parse_from_config', False) - kwargs.pop('comma_separated_list', False) - kwargs.pop('normalize_paths', False) - parser.add_option(*args, **kwargs) - if parse_from_config: - parser.config_options.append(args[-1].lstrip('-')) - - class CopyrightChecker(object): name = 'flake8_copyright' version = __version__ @@ -49,22 +33,22 @@ def __init__(self, tree, filename): @classmethod def add_options(cls, parser): - register_opt( - parser, '--copyright-check', action='store_true', parse_from_config=True, + parser.add_option( + '--copyright-check', action='store_true', parse_from_config=True, help="Checks for copyright notices in every file." ) - register_opt( - parser, '--copyright-min-file-size', default=0, action='store', type='int', + parser.add_option( + '--copyright-min-file-size', default=0, action='store', type='int', parse_from_config=True, help="Minimum number of characters in a file before requiring a copyright notice." ) - register_opt( - parser, '--copyright-author', default='', action='store', + parser.add_option( + '--copyright-author', default='', action='store', parse_from_config=True, help="Checks for a specific author in the copyright notice." ) - register_opt( - parser, '--copyright-regexp', + parser.add_option( + '--copyright-regexp', default=r"Copyright\s+(\(C\)\s+)?\d{4}([-,]\d{4})*\s+%(author)s", action='store', parse_from_config=True, From b6e45b24a2d64a72071dc0b062c0b987b24c8ca6 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Wed, 30 Nov 2022 13:15:24 +0100 Subject: [PATCH 2/2] fix compatibility with flake8 6.x see https://github.com/pycqa/flake8/pull/1739 --- flake8_copyright.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake8_copyright.py b/flake8_copyright.py index 5f798bd..d96aa5c 100644 --- a/flake8_copyright.py +++ b/flake8_copyright.py @@ -38,7 +38,7 @@ def add_options(cls, parser): help="Checks for copyright notices in every file." ) parser.add_option( - '--copyright-min-file-size', default=0, action='store', type='int', + '--copyright-min-file-size', default=0, action='store', type=int, parse_from_config=True, help="Minimum number of characters in a file before requiring a copyright notice." )