summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2012-12-19 01:46:15 +0100
committerFlorent Xicluna <florent.xicluna@gmail.com>2012-12-19 01:46:15 +0100
commit515eb192a37c965d9a80cd10e152ba9a70030b50 (patch)
treed36baed068a4493beaac3df13d7e6204d4c1839e
parent7d3efa228bed40b3b7c1881bd42546e2f9ba6636 (diff)
downloadpep8-515eb192a37c965d9a80cd10e152ba9a70030b50.tar.gz
Add changelog entry for issue #96
-rw-r--r--CHANGES.txt2
-rwxr-xr-xpep8.py2
-rw-r--r--testsuite/E22.py4
3 files changed, 6 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index d70aab4..f089e74 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,7 +5,7 @@ Changelog
1.x (UNRELEASED)
----------------
-* ...
+* Relax E225 for high priority operators (``*``, ``**``, ``/``). (Issue #96)
1.3.4 (2012-12-18)
diff --git a/pep8.py b/pep8.py
index eaae368..2dcae3e 100755
--- a/pep8.py
+++ b/pep8.py
@@ -721,7 +721,7 @@ def missing_whitespace_around_operator(logical_line, tokens):
elif text in WS_NEEDED_OPERATORS:
need_space = True
elif text in UNARY_OPERATORS:
- # Check if the operator is being used in as a binary operator
+ # Check if the operator is being used as a binary operator
# Allow unary operators: -123, -x, +1.
# Allow argument unpacking: foo(*args, **kwargs).
binary_usage = False
diff --git a/testsuite/E22.py b/testsuite/E22.py
index 0583e68..96393d0 100644
--- a/testsuite/E22.py
+++ b/testsuite/E22.py
@@ -88,4 +88,8 @@ print >> sys.stdout, "x is an integer."
if True:
*a, b = (1, 2, 3)
+
+
+def squares(n):
+ return (i**2 for i in range(n))
#: