summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2012-06-15 14:57:32 +0200
committerFlorent Xicluna <florent.xicluna@gmail.com>2012-06-15 14:57:32 +0200
commitda17a56feae02c0efc84781dd4425721c923ddf5 (patch)
tree75680aa0d1d89bd7599d4baddea7fa14a5aba041
parentd01641a80cfbf0d3c7c58c12cb6855d775c876c6 (diff)
downloadpep8-da17a56feae02c0efc84781dd4425721c923ddf5.tar.gz
Release version 1.3.1.3
-rw-r--r--CHANGES.txt2
-rwxr-xr-xpep8.py2
-rw-r--r--testsuite/E12.py8
-rw-r--r--testsuite/E12not.py29
4 files changed, 29 insertions, 12 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 420e4be..ec029cb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,7 +2,7 @@ Changelog
=========
-1.3 (UNRELEASED)
+1.3 (2012-06-15)
----------------
.. warning::
diff --git a/pep8.py b/pep8.py
index deee555..c5ce31d 100755
--- a/pep8.py
+++ b/pep8.py
@@ -93,7 +93,7 @@ for space.
"""
-__version__ = '1.3a2'
+__version__ = '1.3'
import os
import sys
diff --git a/testsuite/E12.py b/testsuite/E12.py
index 5941eb4..1a66b47 100644
--- a/testsuite/E12.py
+++ b/testsuite/E12.py
@@ -61,6 +61,14 @@ rv.update(dict.fromkeys((
'reasonComment_de', 'reasonComment_it'),
'?'),
"foo")
+#: E121
+abricot = 3 + \
+ 4 + \
+ 5 + 6
+#: E126
+abris = 3 + \
+ 4 + \
+ 5 + 6
#:
diff --git a/testsuite/E12not.py b/testsuite/E12not.py
index f52cf64..29f6492 100644
--- a/testsuite/E12not.py
+++ b/testsuite/E12not.py
@@ -86,9 +86,9 @@ foo = long_function_name(
var_three, var_four)
-a = 'AAA' \
- 'BBB' \
- 'CCC'
+arm = 'AAA' \
+ 'BBB' \
+ 'CCC'
bbb = 'AAA' \
'BBB' \
@@ -105,17 +105,26 @@ cc = {'text': 'AAA'
cc = dict(text='AAA'
'BBB')
-a = 'AAA' \
- 'BBB' \
- 'iii' \
- 'CCC'
+sat = 'AAA' \
+ 'BBB' \
+ 'iii' \
+ 'CCC'
+
+abricot = (3 +
+ 4 +
+ 5 + 6)
-a = 3 + \
+abricot = 3 + \
4 + \
5 + 6
-foo(1, 2, 3,
- 4, 5, 6)
+fnct(1, 2, 3,
+ 4, 5, 6)
+
+fnct(1, 2, 3
+ 4, 5, 6,
+ 7, 8, 9,
+ 10, 11)
def long_function_name(