Mercurial Repositories > eric / changeset
changeset
Third Party Packages
Sun, 18 May 2025 17:04:49 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 18 May 2025 17:04:49 +0200
- branch
- eric7
- changeset 11295
- d900e60c1eaf
- parent 11294
- 96826d133cf0
- child 11296
- 2894ef54fe84
Third Party Packages
- Upgraded `pycodestyle` to version 2.13.0.
--- a/docs/ThirdParty.md Sun May 18 11:59:33 2025 +0200 +++ b/docs/ThirdParty.md Sun May 18 17:04:49 2025 +0200 @@ -8,7 +8,7 @@ | eradicate | 2.3.0 | MIT License (Expat License) | | mccabe | 0.7.0 | MIT License (Expat License) | | pip-licenses | 5.0.0 | MIT License (MIT) | -| pycodestyle | 2.12.1 | MIT License (Expat License) | +| pycodestyle | 2.13.0 | MIT License (Expat License) | | pyflakes | 3.2.0 | MIT License (MIT) | | | | | | jquery | 3.7.1 | MIT License (MIT) |
--- a/docs/changelog.md Sun May 18 11:59:33 2025 +0200 +++ b/docs/changelog.md Sun May 18 17:04:49 2025 +0200 @@ -14,6 +14,8 @@ - Added support for IPv6 for WiFi and Ethernet enabled devices (MPy ≥ 1.24.0). - Virtual Environments - Added the capability to set an environment to unavailable. +- Third Party Packages + - Upgraded `pycodestyle` to version 2.13.0. ### Version 25.5 - bug fixes
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/pycodestyle.py Sun May 18 11:59:33 2025 +0200 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/pycodestyle.py Sun May 18 17:04:49 2025 +0200 @@ -84,7 +84,7 @@ ): # pragma: no cover (<py310) tokenize._compile = lru_cache(tokenize._compile) # type: ignore -__version__ = '2.12.1-eric' +__version__ = '2.13.0-eric' DEFAULT_EXCLUDE = '.svn,CVS,.bzr,.hg,.git,__pycache__,.tox' DEFAULT_IGNORE = 'E121,E123,E126,E226,E24,E704,W503,W504' @@ -117,7 +117,7 @@ PyCF_ONLY_AST = 1024 SINGLETONS = frozenset(['False', 'None', 'True']) -KEYWORDS = frozenset(keyword.kwlist + ['print', 'async']) - SINGLETONS +KEYWORDS = frozenset(keyword.kwlist + ['print']) - SINGLETONS UNARY_OPERATORS = frozenset(['>>', '**', '*', '+', '-']) ARITHMETIC_OP = frozenset(['**', '*', '/', '//', '+', '-', '@']) WS_OPTIONAL_OPERATORS = ARITHMETIC_OP.union(['^', '&', '|', '<<', '>>', '%']) @@ -151,6 +151,7 @@ LAMBDA_REGEX = re.compile(r'\blambda\b') HUNK_REGEX = re.compile(r'^@@ -\d+(?:,\d+)? \+(\d+)(?:,(\d+))? @@.*$') STARTSWITH_DEF_REGEX = re.compile(r'^(async\s+def|def)\b') +STARTSWITH_GENERIC_REGEX = re.compile(r'^(async\s+def|def|class|type)\s+\w+\[') STARTSWITH_TOP_LEVEL_REGEX = re.compile(r'^(async\s+def\s+|def\s+|class\s+|@)') STARTSWITH_INDENT_STATEMENT_REGEX = re.compile( r'^\s*({})\b'.format('|'.join(s.replace(' ', r'\s+') for s in ( @@ -249,9 +250,11 @@ W291: spam(1) \n# W293: class Foo(object):\n \n bang = 12 """ - physical_line = physical_line.rstrip('\n') # chr(10), newline - physical_line = physical_line.rstrip('\r') # chr(13), carriage return - physical_line = physical_line.rstrip('\x0c') # chr(12), form feed, ^L + # Strip these trailing characters: + # - chr(10), newline + # - chr(13), carriage return + # - chr(12), form feed, ^L + physical_line = physical_line.rstrip('\n\r\x0c') stripped = physical_line.rstrip(' \t\v') if physical_line != stripped: if stripped: @@ -810,7 +813,6 @@ # Allow "return (a.foo for a in range(5))" not keyword.iskeyword(prev_text) and ( - sys.version_info < (3, 9) or # 3.12+: type is a soft keyword but no braces after prev_text == 'type' or not keyword.issoftkeyword(prev_text) @@ -985,10 +987,8 @@ # Allow argument unpacking: foo(*args, **kwargs). if prev_type == tokenize.OP and prev_text in '}])' or ( prev_type != tokenize.OP and - prev_text not in KEYWORDS and ( - sys.version_info < (3, 9) or - not keyword.issoftkeyword(prev_text) - ) + prev_text not in KEYWORDS and + not keyword.issoftkeyword(prev_text) ): need_space = None elif text in WS_OPTIONAL_OPERATORS: @@ -1047,12 +1047,13 @@ E251: return magic(r = real, i = imag) E252: def complex(real, image: float=0.0): """ - parens = 0 + paren_stack = [] no_space = False require_space = False prev_end = None annotated_func_arg = False in_def = bool(STARTSWITH_DEF_REGEX.match(logical_line)) + in_generic = bool(STARTSWITH_GENERIC_REGEX.match(logical_line)) message = "E251 unexpected spaces around keyword / parameter equals" missing_message = "E252 missing whitespace around parameter equals" @@ -1070,15 +1071,22 @@ yield (prev_end, missing_message) if token_type == tokenize.OP: if text in '([': - parens += 1 - elif text in ')]': - parens -= 1 - elif in_def and text == ':' and parens == 1: + paren_stack.append(text) + # PEP 696 defaults always use spaced-style `=` + # type A[T = default] = ... + # def f[T = default](): ... + # class C[T = default](): ... + if in_generic and paren_stack == ['[']: + annotated_func_arg = True + elif text in ')]' and paren_stack: + paren_stack.pop() + # def f(arg: tp = default): ... + elif text == ':' and in_def and paren_stack == ['(']: annotated_func_arg = True - elif parens == 1 and text == ',': - annotated_func_arg = False - elif parens and text == '=': - if annotated_func_arg and parens == 1: + elif len(paren_stack) == 1 and text == ',': + annotated_func_arg = False + elif paren_stack and text == '=': + if annotated_func_arg and len(paren_stack) == 1: require_space = True if start == prev_end: yield (prev_end, missing_message) @@ -1086,7 +1094,7 @@ no_space = True if start != prev_end: yield (prev_end, message) - if not parens: + if not paren_stack: annotated_func_arg = False prev_end = end @@ -1940,9 +1948,7 @@ def run_check(self, check, argument_names): """Run a check plugin.""" - arguments = [] - for name in argument_names: - arguments.append(getattr(self, name)) + arguments = [getattr(self, name) for name in argument_names] return check(*arguments) def init_checker_state(self, name, argument_names):
