.codecov.yml

@@ -0,0 +1,5 @@
+coverage:
+  status:
+    project:
+      default:
+        threshold: 1%

.github/workflows/python-package.yml

@@ -48,7 +48,8 @@ jobs:
         python test/test_suite.py
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v4
-      if: matrix.python-version == 3.11 && success()
+      if: (matrix.python-version == 3.11 || matrix.python-version == 3.12) && success()
       with:
         fail_ci_if_error: true
+        flags: ${{ matrix.python-version }}
         token: ${{ secrets.CODECOV_TOKEN }}

MANIFEST.in

@@ -18,7 +18,6 @@ recursive-exclude test/suite/out *.py
 exclude .travis.yml
 exclude CONTRIBUTING.rst
 exclude Makefile
-exclude coveralls.bash
 exclude hooks
 exclude hooks/pre-push
 exclude install_hooks.bash

README.rst

@@ -436,9 +436,9 @@ Links
 * PyPI_
 * GitHub_
 * `Travis CI`_
-* Coveralls_
+* Codecov_
 
 .. _PyPI: https://pypi.org/project/autopep8/
 .. _GitHub: https://github.com/hhatto/autopep8
 .. _`Travis CI`: https://travis-ci.org/hhatto/autopep8
-.. _`Coveralls`: https://coveralls.io/r/hhatto/autopep8
+.. _`Codecov`: https://app.codecov.io/gh/hhatto/autopep8

autopep8.py

@@ -89,7 +89,7 @@ class documentation for more information.
 import pycodestyle
 
 
-__version__ = '2.3.0'
+__version__ = '2.3.1'
 
 
 CR = '\r'
@@ -1619,7 +1619,7 @@ def get_index_offset_contents(result, source):
 
 def get_fixed_long_line(target, previous_line, original,
                         indent_word='    ', max_line_length=79,
-                        aggressive=False, experimental=False, verbose=False):
+                        aggressive=0, experimental=False, verbose=False):
     """Break up long line and return result.
 
     Do this by generating multiple reformatted candidates and then
@@ -1896,7 +1896,7 @@ def _priority_key(pep8_result):
 
 
 def shorten_line(tokens, source, indentation, indent_word, max_line_length,
-                 aggressive=False, experimental=False, previous_line=''):
+                 aggressive=0, experimental=False, previous_line=''):
     """Separate line at OPERATOR.
 
     Multiple candidates will be yielded.
@@ -1934,7 +1934,7 @@ def shorten_line(tokens, source, indentation, indent_word, max_line_length,
 
 
 def _shorten_line(tokens, source, indentation, indent_word,
-                  aggressive=False, previous_line=''):
+                  aggressive=0, previous_line=''):
     """Separate line at OPERATOR.
 
     The input is expected to be free of newlines except for inside multiline
@@ -1943,11 +1943,20 @@ def _shorten_line(tokens, source, indentation, indent_word,
     Multiple candidates will be yielded.
 
     """
+    in_string = False
     for (token_type,
          token_string,
          start_offset,
          end_offset) in token_offsets(tokens):
 
+        if IS_SUPPORT_TOKEN_FSTRING:
+            if token_type == tokenize.FSTRING_START:
+                in_string = True
+            elif token_type == tokenize.FSTRING_END:
+                in_string = False
+        if in_string:
+            continue
+
         if (
             token_type == tokenize.COMMENT and
             not is_probably_part_of_multiline(previous_line) and
@@ -3846,13 +3855,23 @@ def _expand_codes(codes, ignore_codes):
     return ret
 
 
+def _parser_error_with_code(
+    parser: argparse.ArgumentParser, code: int, msg: str,
+) -> None:
+    """wrap parser.error with exit code"""
+    parser.print_usage(sys.stderr)
+    parser.exit(code, f"{msg}\n")
+
+
 def parse_args(arguments, apply_config=False):
     """Parse command-line options."""
     parser = create_parser()
     args = parser.parse_args(arguments)
 
     if not args.files and not args.list_fixes:
-        parser.exit(EXIT_CODE_ARGPARSE_ERROR, 'incorrect number of arguments')
+        _parser_error_with_code(
+            parser, EXIT_CODE_ARGPARSE_ERROR, 'incorrect number of arguments',
+        )
 
     args.files = [decode_filename(name) for name in args.files]
 
@@ -3870,56 +3889,65 @@ def parse_args(arguments, apply_config=False):
 
     if '-' in args.files:
         if len(args.files) > 1:
-            parser.exit(
+            _parser_error_with_code(
+                parser,
                 EXIT_CODE_ARGPARSE_ERROR,
                 'cannot mix stdin and regular files',
             )
 
         if args.diff:
-            parser.exit(
+            _parser_error_with_code(
+                parser,
                 EXIT_CODE_ARGPARSE_ERROR,
                 '--diff cannot be used with standard input',
             )
 
         if args.in_place:
-            parser.exit(
+            _parser_error_with_code(
+                parser,
                 EXIT_CODE_ARGPARSE_ERROR,
                 '--in-place cannot be used with standard input',
             )
 
         if args.recursive:
-            parser.exit(
+            _parser_error_with_code(
+                parser,
                 EXIT_CODE_ARGPARSE_ERROR,
                 '--recursive cannot be used with standard input',
             )
 
     if len(args.files) > 1 and not (args.in_place or args.diff):
-        parser.exit(
+        _parser_error_with_code(
+            parser,
             EXIT_CODE_ARGPARSE_ERROR,
             'autopep8 only takes one filename as argument '
             'unless the "--in-place" or "--diff" args are used',
         )
 
     if args.recursive and not (args.in_place or args.diff):
-        parser.exit(
+        _parser_error_with_code(
+            parser,
             EXIT_CODE_ARGPARSE_ERROR,
             '--recursive must be used with --in-place or --diff',
         )
 
     if args.in_place and args.diff:
-        parser.exit(
+        _parser_error_with_code(
+            parser,
             EXIT_CODE_ARGPARSE_ERROR,
             '--in-place and --diff are mutually exclusive',
         )
 
     if args.max_line_length <= 0:
-        parser.exit(
+        _parser_error_with_code(
+            parser,
             EXIT_CODE_ARGPARSE_ERROR,
             '--max-line-length must be greater than 0',
         )
 
     if args.indent_size <= 0:
-        parser.exit(
+        _parser_error_with_code(
+            parser,
             EXIT_CODE_ARGPARSE_ERROR,
             '--indent-size must be greater than 0',
         )
@@ -3959,19 +3987,22 @@ def parse_args(arguments, apply_config=False):
         args.jobs = multiprocessing.cpu_count()
 
     if args.jobs > 1 and not (args.in_place or args.diff):
-        parser.exit(
+        _parser_error_with_code(
+            parser,
             EXIT_CODE_ARGPARSE_ERROR,
             'parallel jobs requires --in-place',
         )
 
     if args.line_range:
         if args.line_range[0] <= 0:
-            parser.exit(
+            _parser_error_with_code(
+                parser,
                 EXIT_CODE_ARGPARSE_ERROR,
                 '--range must be positive numbers',
             )
         if args.line_range[0] > args.line_range[1]:
-            parser.exit(
+            _parser_error_with_code(
+                parser,
                 EXIT_CODE_ARGPARSE_ERROR,
                 'First value of --range should be less than or equal '
                 'to the second',
@@ -4091,7 +4122,7 @@ def read_pyproject_toml(args, parser):
     if config.get("tool", {}).get("autopep8") is None:
         return None
 
-    config = config.get("tool").get("autopep8")
+    config = config.get("tool", {}).get("autopep8")
 
     defaults = {}
     option_list = {o.dest: o.type or type(o.default)