Update pylama to version 1.3.0

Author: klen

pylibs/pylama/__init__.py

@@ -5,7 +5,7 @@
     :license: BSD, see LICENSE for more details.
 """
 
-version_info = 1, 1, 0
+version_info = 1, 3, 0
 
 __version__ = version = '.'.join(map(str, version_info))
 __project__ = __name__

pylibs/pylama/checkers/pep8.py

@@ -45,7 +45,7 @@
 700 statements
 900 syntax error
 """
-__version__ = '1.4.6a0'
+__version__ = '1.4.6'
 
 import os
 import sys
@@ -63,7 +63,7 @@
     from ConfigParser import RawConfigParser
 
 DEFAULT_EXCLUDE = '.svn,CVS,.bzr,.hg,.git,__pycache__'
-DEFAULT_IGNORE = 'E226,E24'
+DEFAULT_IGNORE = 'E123,E226,E24'
 if sys.platform == 'win32':
     DEFAULT_CONFIG = os.path.expanduser(r'~\.pep8')
 else:
@@ -381,7 +381,8 @@ def indentation(logical_line, previous_logical, indent_char,
         yield 0, "E113 unexpected indentation"
 
 
-def continued_indentation(logical_line, tokens, indent_level, noqa, verbose):
+def continued_indentation(logical_line, tokens, indent_level, hang_closing,
+                          noqa, verbose):
     r"""
     Continuation lines should align wrapped elements either vertically using
     Python's implicit line joining inside parentheses, brackets and braces, or
@@ -458,7 +459,8 @@ def continued_indentation(logical_line, tokens, indent_level, noqa, verbose):
                 open_row = 0
             hang = rel_indent[row] - rel_indent[open_row]
             close_bracket = (token_type == tokenize.OP and text in ']})')
-            visual_indent = not close_bracket and indent_chances.get(start[1])
+            visual_indent = (not close_bracket and hang > 0 and
+                             indent_chances.get(start[1]))
 
             if close_bracket and indent[depth]:
                 # closing bracket for visual indent
@@ -467,7 +469,8 @@ def continued_indentation(logical_line, tokens, indent_level, noqa, verbose):
                            "visual indentation")
             elif close_bracket and not hang:
                 # closing bracket matches indentation of opening bracket's line
-                pass
+                if hang_closing:
+                    yield start, "E133 closing bracket is missing indentation"
             elif visual_indent is True:
                 # visual indent is verified
                 if not indent[depth]:
@@ -481,7 +484,7 @@ def continued_indentation(logical_line, tokens, indent_level, noqa, verbose):
                        "under-indented for visual indent")
             elif hang == 4 or (indent_next and rel_indent[row] == 8):
                 # hanging indent is verified
-                if close_bracket:
+                if close_bracket and not hang_closing:
                     yield (start, "E123 closing bracket does not match "
                            "indentation of opening bracket's line")
             else:
@@ -535,6 +538,7 @@ def continued_indentation(logical_line, tokens, indent_level, noqa, verbose):
                 for idx in range(row, -1, -1):
                     if parens[idx]:
                         parens[idx] -= 1
+                        rel_indent[row] = rel_indent[idx]
                         break
             assert len(indent) == depth + 1
             if start[1] not in indent_chances:
@@ -543,7 +547,7 @@ def continued_indentation(logical_line, tokens, indent_level, noqa, verbose):
 
         last_token_multiline = (start[0] != end[0])
 
-    if indent_next and rel_indent[-1] == 4:
+    if indent_next and expand_indent(line) == indent_level + 4:
         yield (last_indent, "E125 continuation line does not distinguish "
                "itself from next logical line")
 
@@ -1183,6 +1187,7 @@ def __init__(self, filename=None, lines=None,
         self._logical_checks = options.logical_checks
         self._ast_checks = options.ast_checks
         self.max_line_length = options.max_line_length
+        self.hang_closing = options.hang_closing
         self.verbose = options.verbose
         self.filename = filename
         if filename is None:
@@ -1693,8 +1698,9 @@ def get_parser(prog='pep8', version=__version__):
     parser = OptionParser(prog=prog, version=version,
                           usage="%prog [options] input ...")
     parser.config_options = [
-        'exclude', 'filename', 'select', 'ignore', 'max-line-length', 'count',
-        'format', 'quiet', 'show-pep8', 'show-source', 'statistics', 'verbose']
+        'exclude', 'filename', 'select', 'ignore', 'max-line-length',
+        'hang-closing', 'count', 'format', 'quiet', 'show-pep8',
+        'show-source', 'statistics', 'verbose']
     parser.add_option('-v', '--verbose', default=0, action='count',
                       help="print status messages, or debug with -vv")
     parser.add_option('-q', '--quiet', default=0, action='count',
@@ -1729,6 +1735,9 @@ def get_parser(prog='pep8', version=__version__):
                       default=MAX_LINE_LENGTH,
                       help="set maximum allowed line length "
                            "(default: %default)")
+    parser.add_option('--hang-closing', action='store_true',
+                      help="hang closing bracket instead of matching "
+                           "indentation of opening bracket's line")
     parser.add_option('--format', metavar='format', default='default',
                       help="set the error format [default|pylint|<custom>]")
     parser.add_option('--diff', action='store_true',

pylibs/pylama/checkers/pyflakes/checker.py

@@ -192,6 +192,10 @@ def unusedAssignments(self):
                 yield name, binding
 
 
+class GeneratorScope(Scope):
+    pass
+
+
 class ModuleScope(Scope):
     pass
 
@@ -319,11 +323,14 @@ def checkDeadScopes(self):
                         self.report(messages.UnusedImport,
                                     importation.source, importation.name)
 
-    def pushFunctionScope(self):
-        self.scopeStack.append(FunctionScope())
+    def pushScope(self, scopeClass=FunctionScope):
+        self.scopeStack.append(scopeClass())
+
+    def pushFunctionScope(self):    # XXX Deprecated
+        self.pushScope(FunctionScope)
 
-    def pushClassScope(self):
-        self.scopeStack.append(ClassScope())
+    def pushClassScope(self):       # XXX Deprecated
+        self.pushScope(ClassScope)
 
     def report(self, messageClass, *args, **kwargs):
         self.messages.append(messageClass(self.filename, *args, **kwargs))
@@ -437,28 +444,22 @@ def handleNodeLoad(self, node):
         else:
             return
 
-        # try enclosing function scopes
+        scopes = [scope for scope in self.scopeStack[:-1]
+                  if isinstance(scope, (FunctionScope, ModuleScope))]
+        if isinstance(self.scope, GeneratorScope) and scopes[-1] != self.scopeStack[-2]:
+            scopes.append(self.scopeStack[-2])
+
+        # try enclosing function scopes and global scope
         importStarred = self.scope.importStarred
-        for scope in self.scopeStack[-2:0:-1]:
+        for scope in reversed(scopes):
             importStarred = importStarred or scope.importStarred
-            if not isinstance(scope, FunctionScope):
-                continue
             try:
                 scope[name].used = (self.scope, node)
             except KeyError:
                 pass
             else:
                 return
 
-        # try global scope
-        importStarred = importStarred or self.scopeStack[0].importStarred
-        try:
-            self.scopeStack[0][name].used = (self.scope, node)
-        except KeyError:
-            pass
-        else:
-            return
-
         # look in the built-ins
         if importStarred or name in self.builtIns:
             return
@@ -570,7 +571,7 @@ def handleDoctests(self, node):
             # leading whitespace: ...
             return
         node_offset = self.offset or (0, 0)
-        self.pushFunctionScope()
+        self.pushScope()
         for example in examples:
             try:
                 tree = compile(example.source, "<doctest>", "exec", ast.PyCF_ONLY_AST)
@@ -632,7 +633,7 @@ def LISTCOMP(self, node):
         self.handleNode(node.elt, node)
 
     def GENERATOREXP(self, node):
-        self.pushFunctionScope()
+        self.pushScope(GeneratorScope)
         # handle generators before element
         for gen in node.generators:
             self.handleNode(gen, node)
@@ -642,7 +643,7 @@ def GENERATOREXP(self, node):
     SETCOMP = GENERATOREXP
 
     def DICTCOMP(self, node):
-        self.pushFunctionScope()
+        self.pushScope(GeneratorScope)
         for gen in node.generators:
             self.handleNode(gen, node)
         self.handleNode(node.key, node)
@@ -742,7 +743,7 @@ def addArgs(arglist):
 
         def runFunction():
 
-            self.pushFunctionScope()
+            self.pushScope()
             for name in args:
                 self.addBinding(node, Argument(name, node), reportRedef=False)
             if isinstance(node.body, list):
@@ -777,7 +778,7 @@ def CLASSDEF(self, node):
         if not PY2:
             for keywordNode in node.keywords:
                 self.handleNode(keywordNode, node)
-        self.pushClassScope()
+        self.pushScope(ClassScope)
         if self.withDoctest:
             self.deferFunction(lambda: self.handleDoctests(node))
         for stmt in node.body:
@@ -847,5 +848,3 @@ def EXCEPTHANDLER(self, node):
         if isinstance(node.name, str):
             self.handleNodeStore(node)
         self.handleChildren(node)
-
-# pymode:lint=0