From 921b22e206d77eaa5426255f0afcdc31e6160ca2 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Fri, 10 Sep 2010 20:58:59 +0200 Subject: [PATCH] Fix E225: accept ``print >>sys.stderr, "..."`` syntax. --- CHANGES.txt | 2 ++ pep8.py | 6 +++--- testsuite/E225i.py | 2 ++ testsuite/E225not.py | 3 ++- 4 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 testsuite/E225i.py diff --git a/CHANGES.txt b/CHANGES.txt index 2c125ab5..fb140470 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -5,6 +5,8 @@ Changelog 0.5.1 (unreleased) ------------------ +* Fix E225: accept ``print >>sys.stderr, "..."`` syntax. + * Fix E501 for lines containing multibyte encoded characters. (Issue #7) * Fix E221, E222, E223, E224 not detected in some cases. (Issue #16) diff --git a/pep8.py b/pep8.py index 177f8236..8f8aaef6 100755 --- a/pep8.py +++ b/pep8.py @@ -128,9 +128,9 @@ def blank_lines(logical_line, blank_lines, indent_level, line_number) WHITESPACE = ' \t' BINARY_OPERATORS = frozenset(['**=', '*=', '+=', '-=', '!=', '<>', - '%=', '^=', '&=', '|=', '==', '/=', '//=', '>=', '<=', '>>=', '<<=', - '%', '^', '&', '|', '=', '/', '//', '>', '<', '>>', '<<']) -UNARY_OPERATORS = frozenset(['**', '*', '+', '-']) + '%=', '^=', '&=', '|=', '==', '/=', '//=', '<=', '>=', '<<=', '>>=', + '%', '^', '&', '|', '=', '/', '//', '<', '>', '<<']) +UNARY_OPERATORS = frozenset(['>>', '**', '*', '+', '-']) OPERATORS = BINARY_OPERATORS | UNARY_OPERATORS SKIP_TOKENS = frozenset([tokenize.COMMENT, tokenize.NL, tokenize.INDENT, tokenize.DEDENT, tokenize.NEWLINE]) diff --git a/testsuite/E225i.py b/testsuite/E225i.py new file mode 100644 index 00000000..6f51eb99 --- /dev/null +++ b/testsuite/E225i.py @@ -0,0 +1,2 @@ +_1MB = 2 ** 20 +_1kB = _1MB >>10 diff --git a/testsuite/E225not.py b/testsuite/E225not.py index 656207bc..918ee8d4 100644 --- a/testsuite/E225not.py +++ b/testsuite/E225not.py @@ -11,4 +11,5 @@ lambda *args, **kw: (args, kw) lambda a, b=h[:], c=0: (a, b, c) if not -5 < x < +5: - print >> sys.stderr, "x is out of range." + print >>sys.stderr, "x is out of range." +print >> sys.stdout, "x is an integer."