Hello community, here is the log from the commit of package python-pep8 for openSUSE:Factory checked in at 2013-02-25 21:41:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pep8 (Old) and /work/SRC/openSUSE:Factory/.python-pep8.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pep8", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-pep8/python-pep8.changes 2013-02-22 16:58:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-pep8.new/python-pep8.changes 2013-02-25 21:41:59.000000000 +0100 @@ -1,0 +2,11 @@ +Sun Feb 24 21:41:18 UTC 2013 - [email protected] + +- Update to version 1.4.4: + * Report E227 or E228 instead of E225 for whitespace around bitwise, + shift or modulo operators. (Issue #166) + * Change the message for E226 to make clear that it is about arithmetic operators. + * Fix a false positive E128 for continuation line indentation with tabs. + * Fix regression with the --diff option. (Issue #169) + * Fix the TestReport class to print the unexpected warnings and errors. + +------------------------------------------------------------------- python3-pep8.changes: same change Old: ---- pep8-1.4.3.tar.gz New: ---- pep8-1.4.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pep8.spec ++++++ --- /var/tmp/diff_new_pack.qP4WmF/_old 2013-02-25 21:42:00.000000000 +0100 +++ /var/tmp/diff_new_pack.qP4WmF/_new 2013-02-25 21:42:00.000000000 +0100 @@ -17,7 +17,7 @@ Name: python-pep8 -Version: 1.4.3 +Version: 1.4.4 Release: 0 Url: http://github.com/jcrocholl/pep8 Summary: Python style guide checker python3-pep8.spec: same change ++++++ pep8-1.4.3.tar.gz -> pep8-1.4.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pep8-1.4.3/CHANGES.txt new/pep8-1.4.4/CHANGES.txt --- old/pep8-1.4.3/CHANGES.txt 2013-02-22 08:20:13.000000000 +0100 +++ new/pep8-1.4.4/CHANGES.txt 2013-02-24 16:26:38.000000000 +0100 @@ -2,6 +2,23 @@ ========= +1.4.4 (2013-02-24) +------------------ + +* Report E227 or E228 instead of E225 for whitespace around bitwise, shift + or modulo operators. (Issue #166) + +* Change the message for E226 to make clear that it is about arithmetic + operators. + +* Fix a false positive E128 for continuation line indentation with tabs. + +* Fix regression with the ``--diff`` option. (Issue #169) + +* Fix the ``TestReport`` class to print the unexpected warnings and + errors. + + 1.4.3 (2013-02-22) ------------------ @@ -54,7 +71,7 @@ 1.4 (2012-12-22) ---------------- -* Report E226 instead of E225 for optional white space around common +* Report E226 instead of E225 for optional whitespace around common operators (``*``, ``**``, ``/``, ``+`` and ``-``). This new error code is ignored in the default configuration because PEP 8 recommends to "use your own judgement". (Issue #96) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pep8-1.4.3/PKG-INFO new/pep8-1.4.4/PKG-INFO --- old/pep8-1.4.3/PKG-INFO 2013-02-22 08:22:09.000000000 +0100 +++ new/pep8-1.4.4/PKG-INFO 2013-02-24 16:29:45.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pep8 -Version: 1.4.3 +Version: 1.4.4 Summary: Python style guide checker Home-page: http://pep8.readthedocs.org/ Author: Johann C. Rocholl @@ -99,6 +99,23 @@ ========= + 1.4.4 (2013-02-24) + ------------------ + + * Report E227 or E228 instead of E225 for whitespace around bitwise, shift + or modulo operators. (Issue #166) + + * Change the message for E226 to make clear that it is about arithmetic + operators. + + * Fix a false positive E128 for continuation line indentation with tabs. + + * Fix regression with the ``--diff`` option. (Issue #169) + + * Fix the ``TestReport`` class to print the unexpected warnings and + errors. + + 1.4.3 (2013-02-22) ------------------ @@ -151,7 +168,7 @@ 1.4 (2012-12-22) ---------------- - * Report E226 instead of E225 for optional white space around common + * Report E226 instead of E225 for optional whitespace around common operators (``*``, ``**``, ``/``, ``+`` and ``-``). This new error code is ignored in the default configuration because PEP 8 recommends to "use your own judgement". (Issue #96) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pep8-1.4.3/docs/conf.py new/pep8-1.4.4/docs/conf.py --- old/pep8-1.4.3/docs/conf.py 2013-02-14 20:03:13.000000000 +0100 +++ new/pep8-1.4.4/docs/conf.py 2013-02-23 11:31:01.000000000 +0100 @@ -235,8 +235,8 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'pep8', u'pep8 documentation', - u'Florent Xicluna', 'pep8', 'One line description of project.', + ('index', 'pep8', u'pep8 documentation', u'Florent Xicluna', + 'pep8', 'One line description of project.', 'Miscellaneous'), ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pep8-1.4.3/docs/intro.rst new/pep8-1.4.4/docs/intro.rst --- old/pep8-1.4.3/docs/intro.rst 2013-02-14 20:03:13.000000000 +0100 +++ new/pep8-1.4.4/docs/intro.rst 2013-02-24 12:07:58.000000000 +0100 @@ -42,14 +42,10 @@ Among other things, these features are currently not in the scope of the ``pep8`` library: -* **naming conventions**: there's `a feature request - <https://github.com/jcrocholl/pep8/issues/44>`_ with `a patch - <https://github.com/jcrocholl/pep8/pull/121>`_, but it might - be too disruptive to include it in the library: currently it's easy to make - an existing project clean regarding ``pep8`` checks; it can be done without - changing the API or the behaviour of the existing code. It's not the same - for naming conventions: if you change the name of a class or a method, it - will break more code which depends on the library. +* **naming conventions**: this kind of feature is supported through plugins. + Install `flake8 <https://pypi.python.org/pypi/flake8>`_ and the + `pep8-naming extension <https://pypi.python.org/pypi/pep8-naming>`_ to use + this feature. * **docstring conventions**: they are not in the scope of this library; see the `pep257 project <https://github.com/GreenSteam/pep257>`_. * **automatic fixing**: see the section *PEP8 Fixers* in the @@ -234,7 +230,11 @@ +----------+----------------------------------------------------------------------+ | E225 | missing whitespace around operator | +----------+----------------------------------------------------------------------+ -| E226 (*) | missing optional whitespace around operator | +| E226 (*) | missing whitespace around arithmetic operator | ++----------+----------------------------------------------------------------------+ +| E227 | missing whitespace around bitwise or shift operator | ++----------+----------------------------------------------------------------------+ +| E228 | missing whitespace around modulo operator | +----------+----------------------------------------------------------------------+ +----------+----------------------------------------------------------------------+ | E231 | missing whitespace after ',' | @@ -352,7 +352,10 @@ Related tools ------------- -Some tools which use ``pep8`` are referenced in the Wiki: `list of related tools +The `flake8 checker <https://flake8.readthedocs.org>`_ is a wrapper around +``pep8`` and similar tools. It supports plugins. + +Other tools which use ``pep8`` are referenced in the Wiki: `list of related tools <https://github.com/jcrocholl/pep8/wiki/RelatedTools>`_. .. _PEP 8: http://www.python.org/dev/peps/pep-0008/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pep8-1.4.3/pep8.egg-info/PKG-INFO new/pep8-1.4.4/pep8.egg-info/PKG-INFO --- old/pep8-1.4.3/pep8.egg-info/PKG-INFO 2013-02-22 08:22:07.000000000 +0100 +++ new/pep8-1.4.4/pep8.egg-info/PKG-INFO 2013-02-24 16:29:45.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pep8 -Version: 1.4.3 +Version: 1.4.4 Summary: Python style guide checker Home-page: http://pep8.readthedocs.org/ Author: Johann C. Rocholl @@ -99,6 +99,23 @@ ========= + 1.4.4 (2013-02-24) + ------------------ + + * Report E227 or E228 instead of E225 for whitespace around bitwise, shift + or modulo operators. (Issue #166) + + * Change the message for E226 to make clear that it is about arithmetic + operators. + + * Fix a false positive E128 for continuation line indentation with tabs. + + * Fix regression with the ``--diff`` option. (Issue #169) + + * Fix the ``TestReport`` class to print the unexpected warnings and + errors. + + 1.4.3 (2013-02-22) ------------------ @@ -151,7 +168,7 @@ 1.4 (2012-12-22) ---------------- - * Report E226 instead of E225 for optional white space around common + * Report E226 instead of E225 for optional whitespace around common operators (``*``, ``**``, ``/``, ``+`` and ``-``). This new error code is ignored in the default configuration because PEP 8 recommends to "use your own judgement". (Issue #96) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pep8-1.4.3/pep8.egg-info/SOURCES.txt new/pep8-1.4.4/pep8.egg-info/SOURCES.txt --- old/pep8-1.4.3/pep8.egg-info/SOURCES.txt 2013-02-22 08:22:09.000000000 +0100 +++ new/pep8-1.4.4/pep8.egg-info/SOURCES.txt 2013-02-24 16:29:45.000000000 +0100 @@ -40,7 +40,6 @@ testsuite/E72.py testsuite/E90.py testsuite/W19.py -testsuite/W19tab.py testsuite/W29.py testsuite/W39.py testsuite/W60.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pep8-1.4.3/pep8.py new/pep8-1.4.4/pep8.py --- old/pep8-1.4.3/pep8.py 2013-02-22 08:20:23.000000000 +0100 +++ new/pep8-1.4.4/pep8.py 2013-02-24 16:27:10.000000000 +0100 @@ -45,7 +45,7 @@ 700 statements 900 syntax error """ -__version__ = '1.4.3' +__version__ = '1.4.4' import os import sys @@ -81,11 +81,11 @@ SINGLETONS = frozenset(['False', 'None', 'True']) KEYWORDS = frozenset(keyword.kwlist + ['print']) - SINGLETONS UNARY_OPERATORS = frozenset(['>>', '**', '*', '+', '-']) -WS_OPTIONAL_OPERATORS = frozenset(['**', '*', '/', '//', '+', '-']) +ARITHMETIC_OP = frozenset(['**', '*', '/', '//', '+', '-']) +WS_OPTIONAL_OPERATORS = ARITHMETIC_OP.union(['^', '&', '|', '<<', '>>', '%']) WS_NEEDED_OPERATORS = frozenset([ - '**=', '*=', '/=', '//=', '+=', '-=', '!=', '<>', - '%=', '^=', '&=', '|=', '==', '<=', '>=', '<<=', '>>=', - '%', '^', '&', '|', '=', '<', '>', '<<']) + '**=', '*=', '/=', '//=', '+=', '-=', '!=', '<>', '<', '>', + '%=', '^=', '&=', '|=', '==', '<=', '>=', '<<=', '>>=', '=']) WHITESPACE = frozenset(' \t') SKIP_TOKENS = frozenset([tokenize.COMMENT, tokenize.NL, tokenize.NEWLINE, tokenize.INDENT, tokenize.DEDENT]) @@ -99,8 +99,8 @@ EXTRANEOUS_WHITESPACE_REGEX = re.compile(r'[[({] | []}),;:]') WHITESPACE_AFTER_COMMA_REGEX = re.compile(r'[,;:]\s*(?: |\t)') COMPARE_SINGLETON_REGEX = re.compile(r'([=!]=)\s*(None|False|True)') -COMPARE_TYPE_REGEX = re.compile(r'([=!]=|is|is\s+not)\s*type(?:s\.(\w+)Type' - r'|\(\s*(\(\s*\)|[^)]*[^ )])\s*\))') +COMPARE_TYPE_REGEX = re.compile(r'(?:[=!]=|is(?:\s+not)?)\s*type(?:s.\w+Type' + r'|\s*\(\s*([^)]*[^ )])\s*\))') KEYWORD_REGEX = re.compile(r'(\s*)\b(?:%s)\b(\s*)' % r'|'.join(KEYWORDS)) OPERATOR_REGEX = re.compile(r'(?:[^,\s])(\s*)(?:[-+*/|!<=>%&^]+)(\s*)') LAMBDA_REGEX = re.compile(r'\blambda\b') @@ -426,9 +426,9 @@ # relative indents of physical lines rel_indent = [0] * nrows # visual indents - indent = [indent_level] indent_chances = {} last_indent = tokens[0][2] + indent = [last_indent[1]] if verbose >= 3: print(">>> " + tokens[0][4].rstrip()) @@ -626,25 +626,16 @@ Okay: hypot2 = x * x + y * y Okay: c = (a + b) * (a - b) Okay: foo(bar, key='word', *args, **kwargs) - Okay: baz(**kwargs) - Okay: negative = -1 - Okay: spam(-1) Okay: alpha[:-i] - Okay: if not -5 < x < +5:\n pass - Okay: lambda *args, **kw: (args, kw) - Okay: z = 2 ** 30 - Okay: x = x / 2 - 1 E225: i=i+1 E225: submitted +=1 - E225: c = alpha -4 E225: x = x /2 - 1 E225: z = x **y E226: c = (a+b) * (a-b) - E226: z = 2**30 - E226: x = x*2 - 1 - E226: x = x/2 - 1 E226: hypot2 = x*x + y*y + E227: c = a|b + E228: msg = fmt%(errno, errmsg) """ parens = 0 need_space = False @@ -674,8 +665,13 @@ # A needed trailing space was not found yield prev_end, "E225 missing whitespace around operator" else: - yield (need_space[0], - "E226 missing optional whitespace around operator") + code, optype = 'E226', 'arithmetic' + if prev_text == '%': + code, optype = 'E228', 'modulo' + elif prev_text not in ARITHMETIC_OP: + code, optype = 'E227', 'bitwise or shift' + yield (need_space[0], "%s missing whitespace " + "around %s operator" % (code, optype)) need_space = False elif token_type == tokenize.OP and prev_end is not None: if text == '=' and parens: @@ -949,10 +945,10 @@ """ match = COMPARE_TYPE_REGEX.search(logical_line) if match: - inst = match.group(3) + inst = match.group(1) if inst and isidentifier(inst) and inst not in SINGLETONS: return # Allow comparison for types which are not obvious - yield match.start(1), "E721 do not compare types, use 'isinstance()'" + yield match.start(0), "E721 do not compare types, use 'isinstance()'" def python_3000_has_key(logical_line): @@ -1814,16 +1810,18 @@ args.append(options.testsuite) elif not options.ensure_value('doctest', False): if parse_argv and not args: - import select - # wait for 1 second on the stdin fd - reads, __, __ = select.select([sys.stdin], [], [], 1.) - if reads: - args = ['-'] - elif options.diff or any(os.path.exists(name) - for name in PROJECT_CONFIG): + if options.diff: args = ['.'] else: - parser.error('input not specified') + import select + # wait for 1 second on the stdin fd + reads, __, __ = select.select([sys.stdin], [], [], 1.) + if reads: + args = ['-'] + elif any(os.path.exists(name) for name in PROJECT_CONFIG): + args = ['.'] + else: + parser.error('input not specified') options = read_config(options, args, arglist, parser) options.reporter = parse_argv and options.quiet == 1 and FileReport diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pep8-1.4.3/testsuite/E22.py new/pep8-1.4.4/testsuite/E22.py --- old/pep8-1.4.3/testsuite/E22.py 2012-12-20 14:07:24.000000000 +0100 +++ new/pep8-1.4.4/testsuite/E22.py 2013-02-24 12:59:57.000000000 +0100 @@ -53,10 +53,14 @@ #: E225 c =-1 #: E225 +x = x /2 - 1 +#: E225 c = alpha -4 #: E225 c = alpha- 4 #: E225 +z = x **y +#: E225 z = (x + 1) **y #: E225 z = (x + 1)** y @@ -79,6 +83,9 @@ #: E225 E226 c = (a+ b)*(a - b) #: + +#: E226 +z = 2**30 #: E226 c = (a+b) * (a-b) #: E226 @@ -86,13 +93,32 @@ #: E226 x = x*2 - 1 #: E226 +x = x/2 - 1 +#: E226 hypot2 = x*x + y*y #: E226 c = (a + b)*(a - b) #: E226 def squares(n): return (i**2 for i in range(n)) +#: E227 +_1kB = _1MB>>10 +#: E227 +_1MB = _1kB<<10 +#: E227 +a = b|c +#: E227 +b = c&a +#: E227 +c = b^a +#: E228 +a = b%c +#: E228 +msg = fmt%(errno, errmsg) +#: E228 +msg = "Error %d occured"%errno #: + #: Okay i = i + 1 submitted += 1 @@ -110,8 +136,10 @@ if not -5 < x < +5: print >>sys.stderr, "x is out of range." print >> sys.stdout, "x is an integer." +z = 2 ** 30 +x = x / 2 - 1 -if True: +if alpha[:-i]: *a, b = (1, 2, 3) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pep8-1.4.3/testsuite/E72.py new/pep8-1.4.4/testsuite/E72.py --- old/pep8-1.4.3/testsuite/E72.py 2012-05-27 22:29:13.000000000 +0200 +++ new/pep8-1.4.4/testsuite/E72.py 2013-02-24 14:47:07.000000000 +0100 @@ -14,6 +14,30 @@ if type(res) is not types.ListType: pass +#: E721 +assert type(res) == type(False) or type(res) == type(None) +#: E721 +assert type(res) == type([]) +#: E721 +assert type(res) == type(()) +#: E721 +assert type(res) == type((0,)) +#: E721 +assert type(res) == type((0)) +#: E721 +assert type(res) != type((1, )) +#: E721 +assert type(res) is type((1, )) +#: E721 +assert type(res) is not type((1, )) +#: E211 E721 +assert type(res) == type ([2, ]) +#: E201 E202 E721 +assert type(res) == type( ( ) ) +#: E201 E202 E721 +assert type(res) == type( (0, ) ) +#: + #: Okay import types diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pep8-1.4.3/testsuite/E90.py new/pep8-1.4.4/testsuite/E90.py --- old/pep8-1.4.3/testsuite/E90.py 2012-12-22 19:56:19.000000000 +0100 +++ new/pep8-1.4.4/testsuite/E90.py 2013-02-24 15:59:55.000000000 +0100 @@ -8,7 +8,7 @@ pass except: print 'Whoops' -#: E122 E128 E225 E251 E701 +#: E122 E225 E251 E701 # Do not crash if code is invalid if msg: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pep8-1.4.3/testsuite/W19.py new/pep8-1.4.4/testsuite/W19.py --- old/pep8-1.4.3/testsuite/W19.py 2012-04-06 17:36:29.000000000 +0200 +++ new/pep8-1.4.4/testsuite/W19.py 2013-02-24 16:14:29.000000000 +0100 @@ -1,3 +1,104 @@ #: W191 if False: print # indented with 1 tab +#: + + +#: E126 W191 +y = x == 2 \ + or x == 3 +#: E101 W191 +if ( + x == ( + 3 + ) or + y == 4): + pass +#: E101 W191 +if x == 2 \ + or y > 1 \ + or x == 3: + pass +#: E101 W191 +if x == 2 \ + or y > 1 \ + or x == 3: + pass +#: + +#: E101 W191 +if (foo == bar and + baz == frop): + pass +#: E101 W191 +if ( + foo == bar and + baz == frop +): + pass +#: + +#: E101 W191 +if start[1] > end_col and not ( + over_indent == 4 and indent_next): + return(0, "E121 continuation line over-" + "indented for visual indent") +#: + +#: E101 W191 + + +def long_function_name( + var_one, var_two, var_three, + var_four): + print(var_one) +#: E101 W191 +if ((row < 0 or self.moduleCount <= row or + col < 0 or self.moduleCount <= col)): + raise Exception("%s,%s - %s" % (row, col, self.moduleCount)) +#: E101 W191 +if bar: + return( + start, 'E121 lines starting with a ' + 'closing bracket should be indented ' + "to match that of the opening " + "bracket's line" + ) +# +#: E101 W191 +# you want vertical alignment, so use a parens +if ((foo.bar("baz") and + foo.bar("frop") + )): + print "yes" +#: E101 W191 +# also ok, but starting to look like LISP +if ((foo.bar("baz") and + foo.bar("frop"))): + print "yes" +#: E101 W191 +if (a == 2 or + b == "abc def ghi" + "jkl mno"): + return True +#: E101 W191 +if (a == 2 or + b == """abc def ghi +jkl mno"""): + return True +#: E101 W191 +if length > options.max_line_length: + return options.max_line_length, \ + "E501 line too long (%d characters)" % length + + +# +#: E101 W191 +if os.path.exists(os.path.join(path, PEP8_BIN)): + cmd = ([os.path.join(path, PEP8_BIN)] + + self._pep8_options(targetfile)) +#: E101 W191 +if foo is None and bar is "frop" and \ + blah == 'yeah': + blah = 'yeahnah' +#: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pep8-1.4.3/testsuite/W19tab.py new/pep8-1.4.4/testsuite/W19tab.py --- old/pep8-1.4.3/testsuite/W19tab.py 2013-02-05 23:57:28.000000000 +0100 +++ new/pep8-1.4.4/testsuite/W19tab.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,546 +0,0 @@ -#: E101 W191 -if ( - x == ( - 3 - ) or - y == 4): - pass - -y = x == 2 \ - or x == 3 - -if x == 2 \ - or y > 1 \ - or x == 3: - pass - -if x == 2 \ - or y > 1 \ - or x == 3: - pass -#: - - -if (foo == bar and - baz == frop): - pass - -if ( - foo == bar and - baz == frop -): - pass - - -a = ( -) - -a = (123, - ) - - -# - - -if start[1] > end_col and not ( - over_indent == 4 and indent_next): - return(0, "E121 continuation line over-" - "indented for visual indent") - - -print "OK", ("visual", - "indent") - -print "Okay", ("visual", - "indent_three" - ) - -print "a-ok", ( - "there", - "dude", -) - -print "hello", ( - "there", - "dude") - -print "hello", ( - - "there", - # "john", - "dude") - -print "hello", ( - "there", "dude") - -print "hello", ( - "there", "dude", -) - -# Aligned with opening delimiter -foo = long_function_name(var_one, var_two, - var_three, var_four) - -# -# Extra indentation is not necessary. -foo = long_function_name( - var_one, var_two, - var_three, var_four) - - -arm = 'AAA' \ - 'BBB' \ - 'CCC' - -bbb = 'AAA' \ - 'BBB' \ - 'CCC' - -cc = ('AAA' - 'BBB' - 'CCC') - -cc = {'text': 'AAA' - 'BBB' - 'CCC'} - -cc = dict(text='AAA' - 'BBB') - -sat = 'AAA' \ - 'BBB' \ - 'iii' \ - 'CCC' - -abricot = (3 + - 4 + - 5 + 6) - -abricot = 3 + \ - 4 + \ - 5 + 6 - -part = [-1, 2, 3, - 4, 5, 6] - -part = [-1, (2, 3, - 4, 5, 6), 7, - 8, 9, 0] - -fnct(1, 2, 3, - 4, 5, 6) - -fnct(1, 2, 3 - 4, 5, 6, - 7, 8, 9, - 10, 11) - - -def long_function_name( - var_one, var_two, var_three, - var_four): - print(var_one) - -if ((row < 0 or self.moduleCount <= row or - col < 0 or self.moduleCount <= col)): - raise Exception("%s,%s - %s" % (row, col, self.moduleCount)) - - -result = { - 'foo': [ - 'bar', { - 'baz': 'frop', - } - ] -} - - -foo = my.func({ - "foo": "bar", -}, "baz") - - -# - -fooff(aaaa, - cca( - vvv, - dadd - ), fff, - ggg) - -fooff(aaaa, - abbb, - cca( - vvv, - aaa, - dadd), - "visual indentation is not a multiple of four",) -# - -if bar: - return( - start, 'E121 lines starting with a ' - 'closing bracket should be indented ' - "to match that of the opening " - "bracket's line" - ) -# -# you want vertical alignment, so use a parens -if ((foo.bar("baz") and - foo.bar("frop") - )): - print "yes" - -# also ok, but starting to look like LISP -if ((foo.bar("baz") and - foo.bar("frop"))): - print "yes" - -if (a == 2 or - b == "abc def ghi" - "jkl mno"): - return True - -if (a == 2 or - b == """abc def ghi -jkl mno"""): - return True - -if length > options.max_line_length: - return options.max_line_length, \ - "E501 line too long (%d characters)" % length - - -# - - -print 'l.{line}\t{pos}\t{name}\t{text}'.format( - line=token[2][0], - pos=pos, - name=tokenize.tok_name[token[0]], - text=repr(token[1]), -) - -print('%-7d %s per second (%d total)' % ( - options.counters[key] / elapsed, key, - options.counters[key])) - - -if os.path.exists(os.path.join(path, PEP8_BIN)): - cmd = ([os.path.join(path, PEP8_BIN)] + - self._pep8_options(targetfile)) - - -fixed = (re.sub(r'\t+', ' ', target[c::-1], 1)[::-1] + - target[c + 1:]) - -fixed = ( - re.sub(r'\t+', ' ', target[c::-1], 1)[::-1] + - target[c + 1:] -) - - -if foo is None and bar is "frop" and \ - blah == 'yeah': - blah = 'yeahnah' - - -"""This is a multi-line - docstring.""" - - -if blah: - # is this actually readable? :) - multiline_literal = """ -while True: - if True: - 1 -""".lstrip() - multiline_literal = ( - """ -while True: - if True: - 1 -""".lstrip() - ) - multiline_literal = ( - """ -while True: - if True: - 1 -""" - .lstrip() - ) - - -if blah: - multiline_visual = (""" -while True: - if True: - 1 -""" - .lstrip()) - - -rv = {'aaa': 42} -rv.update(dict.fromkeys(( - 'qualif_nr', 'reasonComment_en', 'reasonComment_fr', - 'reasonComment_de', 'reasonComment_it'), '?')) - -rv.update(dict.fromkeys(('qualif_nr', 'reasonComment_en', - 'reasonComment_fr', 'reasonComment_de', - 'reasonComment_it'), '?')) - -rv.update(dict.fromkeys(('qualif_nr', 'reasonComment_en', 'reasonComment_fr', - 'reasonComment_de', 'reasonComment_it'), '?')) - - -rv.update(dict.fromkeys( - ('qualif_nr', 'reasonComment_en', 'reasonComment_fr', - 'reasonComment_de', 'reasonComment_it'), '?' -), "foo", context={ - 'alpha': 4, 'beta': 53242234, 'gamma': 17, -}) - - -rv.update( - dict.fromkeys(( - 'qualif_nr', 'reasonComment_en', 'reasonComment_fr', - 'reasonComment_de', 'reasonComment_it'), '?'), - "foo", - context={ - 'alpha': 4, 'beta': 53242234, 'gamma': 17, - }, -) - - -# - - -event_obj.write(cursor, user_id, { - 'user': user, - 'summary': text, - 'data': data, -}) - -event_obj.write(cursor, user_id, { - 'user': user, - 'summary': text, - 'data': {'aaa': 1, 'bbb': 2}, -}) - -event_obj.write(cursor, user_id, { - 'user': user, - 'summary': text, - 'data': { - 'aaa': 1, - 'bbb': 2}, -}) - -event_obj.write(cursor, user_id, { - 'user': user, - 'summary': text, - 'data': {'timestamp': now, 'content': { - 'aaa': 1, - 'bbb': 2 - }}, -}) - - -def qualify_by_address( - self, cr, uid, ids, context=None, - params_to_check=frozenset(QUALIF_BY_ADDRESS_PARAM)): - """ This gets called by the web server """ - - -def qualify_by_address(self, cr, uid, ids, context=None, - params_to_check=frozenset(QUALIF_BY_ADDRESS_PARAM)): - """ This gets called by the web server """ - - -_ipv4_re = re.compile('^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.' - '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.' - '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.' - '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$') - - -fct(""" - AAA """ + status_2_string) - - -if context: - msg = """\ -action: GET-CONFIG -payload: - ip_address: "%(ip)s" - username: "%(username)s" -""" % context - - -if context: - msg = """\ -action: \ -GET-CONFIG -""" % context - - -if context: - msg = """\ -action: """\ -"""GET-CONFIG -""" % context - - -def unicode2html(s): - """Convert the characters &<>'" in string s to HTML-safe sequences. - Convert newline to <br> too.""" - return unicode((s or '').replace('&', '&') - .replace('>', '>') - .replace('<', '<') - .replace("'", ''') - .replace('"', '"') - .replace('\n', '<br>\n')) - -# -parser.add_option('--count', action='store_true', - help="print total number of errors and warnings " - "to standard error and set exit code to 1 if " - "total is not null") - -parser.add_option('--exclude', metavar='patterns', default=DEFAULT_EXCLUDE, - help="exclude files or directories which match these " - "comma separated patterns (default: %s)" % - DEFAULT_EXCLUDE) - -add_option('--count', - help="print total number of errors " - "to standard error total is not null") - -add_option('--count', - help="print total number of errors " - "to standard error " - "total is not null") - - -# - - -help = ("print total number of errors " + - "to standard error") - -help = "print total number of errors " \ - "to standard error" - -help = u"print total number of errors " \ - u"to standard error" - -help = ur"print total number of errors " \ - ur"to standard error" - -help = b"print total number of errors " \ - b"to standard error" - -help = br"print total number of errors " \ - br"to standard error" - -d = dict('foo', help="exclude files or directories which match these " - "comma separated patterns (default: %s)" % - DEFAULT_EXCLUDE) - -d = dict('foo', help=u"exclude files or directories which match these " - u"comma separated patterns (default: %s)" % - DEFAULT_EXCLUDE) - -d = dict('foo', help=b"exclude files or directories which match these " - b"comma separated patterns (default: %s)" % - DEFAULT_EXCLUDE) - -d = dict('foo', help=br"exclude files or directories which match these " - br"comma separated patterns (default: %s)" % - DEFAULT_EXCLUDE) - -d = dict('foo', - help="exclude files or directories which match these " - "comma separated patterns (default: %s)" % - DEFAULT_EXCLUDE) - -d = dict('foo', - help="exclude files or directories which match these " - "comma separated patterns (default: %s, %s)" % - (DEFAULT_EXCLUDE, DEFAULT_IGNORE) - ) - -d = dict('foo', - help="exclude files or directories which match these " - "comma separated patterns (default: %s, %s)" % - # who knows what might happen here? - (DEFAULT_EXCLUDE, DEFAULT_IGNORE) - ) - -# parens used to allow the indenting. -troublefree_hash = { - "hash": "value", - "long": ("the quick brown fox jumps over the lazy dog before doing a " - "somersault"), - "long key that tends to happen more when you're indented": ( - "stringwithalongtoken you don't want to break" - ), -} - -# another accepted form -troublefree_hash = { - "hash": "value", - "long": "the quick brown fox jumps over the lazy dog before doing " - "a somersault", - ("long key that tends to happen more " - "when you're indented"): "stringwithalongtoken you don't want to break", -} -# confusing but accepted... don't do that -troublesome_hash = { - "hash": "value", - "long": "the quick brown fox jumps over the lazy dog before doing a " - "somersault", - "long key that tends to happen more " - "when you're indented": "stringwithalongtoken you don't want to break", -} - -# -d = dict('foo', - help="exclude files or directories which match these " - "comma separated patterns (default: %s)" % - DEFAULT_EXCLUDE - ) -d = dict('foo', - help="exclude files or directories which match these " - "comma separated patterns (default: %s)" % DEFAULT_EXCLUDE, - foobar="this clearly should work, because it is at " - "the right indent level", - ) - -rv.update(dict.fromkeys( - ('qualif_nr', 'reasonComment_en', 'reasonComment_fr', - 'reasonComment_de', 'reasonComment_it'), - '?'), "foo", - context={'alpha': 4, 'beta': 53242234, 'gamma': 17}) - - -def f(): - try: - if not Debug: - print(''' -If you would like to see debugging output, -try: %s -d5 -''' % sys.argv[0]) - - -d = { # comment - 1: 2 -} - -# issue 138 -[ - 12, # this is a multi-line inline - # comment -] -# diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pep8-1.4.3/testsuite/test_pep8.py new/pep8-1.4.4/testsuite/test_pep8.py --- old/pep8-1.4.3/testsuite/test_pep8.py 2013-02-14 20:03:13.000000000 +0100 +++ new/pep8-1.4.4/testsuite/test_pep8.py 2013-02-24 12:22:13.000000000 +0100 @@ -37,7 +37,7 @@ for key in set(self.counters) - set(self._benchmark_keys): del self.counters[key] self.messages = {} - return self.file_errors + return super(TestReport, self).get_file_results() def print_results(self): results = ("%(physical lines)d lines tested: %(files)d files, " -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
