Unverified Commit c04ec119 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #238001 from mweinelt/pycodestyle-test-fix 

python311Packages.pycodestyle: Fix tests on python 3.11.4
parents af7beed7 d8019d3d

pkgs/development/python-modules/pycodestyle/default.nix

+7 −0
Original line number Diff line number Diff line
@@ -18,6 +18,13 @@ buildPythonPackage rec { 
    hash = "sha256-NHGHvbR2Mp2Y9pXCE9cpWoRtEVL/T+m6y4qVkLjucFM=";

  };



  patches = [

    # https://github.com/PyCQA/pycodestyle/issues/1151

    # Applies a modified version of an upstream patch that only applied

    # to Python 3.12.

    ./python-3.11.4-compat.patch

  ];



  # https://github.com/PyCQA/pycodestyle/blob/2.10.0/tox.ini#L13

  checkPhase = ''

    ${python.interpreter} -m pycodestyle --statistics pycodestyle.py

pkgs/development/python-modules/pycodestyle/python-3.11.4-compat.patch

0 → 100644
+16 −0
Original line number Diff line number Diff line 
diff --git a/testsuite/test_api.py b/testsuite/test_api.py

index 8dde32ff..38e34acf 100644

--- a/testsuite/test_api.py

+++ b/testsuite/test_api.py

@@ -329,7 +329,10 @@ def test_check_nullbytes(self):

         count_errors = pep8style.input_file('stdin', lines=['\x00\n'])

 

         stdout = sys.stdout.getvalue()

-        expected = "stdin:1:1: E901 ValueError"

+        if sys.version_info < (3, 11, 4):

+            expected = "stdin:1:1: E901 ValueError"

+        else:

+            expected = "stdin:1:1: E901 SyntaxError: source code string cannot contain null bytes"  # noqa: E501

         self.assertTrue(stdout.startswith(expected),

                         msg='Output %r does not start with %r' %

                         (stdout, expected))