[packages/python-pep8] - rediff patches

baggins baggins at pld-linux.org
Wed Mar 3 12:59:01 CET 2021


commit 723c209b11237a9ea140378c3f973d79c29a209a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Mar 3 12:58:50 2021 +0100

    - rediff patches

 python-pep8-nestedset.patch |  7 ++++---
 python-pep8-tokenize.patch  | 29 +++++------------------------
 2 files changed, 9 insertions(+), 27 deletions(-)
---
diff --git a/python-pep8-nestedset.patch b/python-pep8-nestedset.patch
index 6baabc5..74d8de6 100644
--- a/python-pep8-nestedset.patch
+++ b/python-pep8-nestedset.patch
@@ -1,6 +1,7 @@
---- pep8-1.7.1/pep8.py.orig	2017-10-24 16:38:06.000000000 +0200
-+++ pep8-1.7.1/pep8.py	2020-01-12 20:35:19.209557017 +0100
-@@ -107,7 +107,7 @@
+diff -urNp -x '*.orig' pep8-1.7.1.org/pep8.py pep8-1.7.1/pep8.py
+--- pep8-1.7.1.org/pep8.py	2017-10-24 16:38:06.000000000 +0200
++++ pep8-1.7.1/pep8.py	2021-03-03 12:58:18.010231361 +0100
+@@ -107,7 +107,7 @@ RAISE_COMMA_REGEX = re.compile(r'raise\s
  RERAISE_COMMA_REGEX = re.compile(r'raise\s+\w+\s*,.*,\s*\w+\s*$')
  ERRORCODE_REGEX = re.compile(r'\b[A-Z]\d{3}\b')
  DOCSTRING_REGEX = re.compile(r'u?r?["\']')
diff --git a/python-pep8-tokenize.patch b/python-pep8-tokenize.patch
index f11d8f7..66abd4f 100644
--- a/python-pep8-tokenize.patch
+++ b/python-pep8-tokenize.patch
@@ -1,26 +1,7 @@
-From 397463014fda3cdefe8d6c9d117ae16d878dc494 Mon Sep 17 00:00:00 2001
-From: Michael Hudson-Doyle <michael.hudson at canonical.com>
-Date: Tue, 25 Sep 2018 14:58:57 +1200
-Subject: [PATCH] Keep compability with stdlib tokenize.py changes
-
-https://github.com/python/cpython/commit/c4ef4896eac86a6759901c8546e26de4695a1389
-is not yet part of any release of Python but has been backported to all
-versions in Git (includeing 2.7!). It causes the tokenize.py module to
-emit a synthetic NEWLINE token for files that do not in fact end with a
-newline, which confuses pycodestyle's checks for blank lines at the end
-of a file. Fortunately the synthetic NEWLINE tokens are easy to detect
-(the token text is "").
-
-Fixes #786
----
- pycodestyle.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pycodestyle.py b/pycodestyle.py
-index 0d725d27..fbc3dca3 100755
---- a/pep8.py
-+++ b/pep8.py
-@@ -258,10 +258,10 @@ def trailing_blank_lines(physical_line, lines, line_number, total_lines):
+diff -urNp -x '*.orig' pep8-1.7.1.org/pep8.py pep8-1.7.1/pep8.py
+--- pep8-1.7.1.org/pep8.py	2021-03-03 12:58:18.046897823 +0100
++++ pep8-1.7.1/pep8.py	2021-03-03 12:58:18.076897654 +0100
+@@ -190,10 +190,10 @@ def trailing_blank_lines(physical_line,
      """
      if line_number == total_lines:
          stripped_last_line = physical_line.rstrip()
@@ -32,4 +13,4 @@ index 0d725d27..fbc3dca3 100755
 +            return len(lines[-1]), "W292 no newline at end of file"
  
  
- @register_check
+ def maximum_line_length(physical_line, max_line_length, multiline):
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-pep8.git/commitdiff/723c209b11237a9ea140378c3f973d79c29a209a



More information about the pld-cvs-commit mailing list