Merge branch 'release/0.8.1'

klen · klen · commit c6a872a64530 · 2014-06-11T18:20:50.000+04:00
diff --git a/Changelog.rst b/Changelog.rst
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-## 2013-12-04 0.8.0
+## 2014-06-11 0.8.1
 -------------------
     * Pylama updated to version 3.3.2
     * Get fold's expression symbol from &fillchars;
diff --git a/autoload/pymode/troubleshooting.vim b/autoload/pymode/troubleshooting.vim
@@ -18,22 +18,26 @@ fun! pymode#troubleshooting#test() "{{{
 
     call append('0', ['Pymode diagnostic',
                   \ '===================',
-                  \ 'VIM:' . v:version . ', OS: ' . os .', multi_byte:' .  has('multi_byte') . ', pymode: ' . g:pymode_version . ', python: ' . g:pymode_python, 
+                  \ 'VIM:' . v:version . ', OS: ' . os .', multi_byte:' .  has('multi_byte') . ', pymode: ' . g:pymode_version . ', pymode-python: ' . g:pymode_python, 
                   \ ''])
 
     if !exists('#filetypeplugin')
         call append('$', ['WARNING: ', 'Python-mode required :filetype plugin indent on', ''])
     endif
 
+    call append('$', ['+python: ' . has('python')])
+    call append('$', ['+python3: ' . has('python3'), ''])
+
     if g:pymode_python == 'disable'
+
         if !has('python') && !has('python3')
 
-            call append('$', ['WARNING: ', 'Python-mode required vim compiled with +python or +python3.',
+            call append('$', ['WARNING: Python-mode required vim compiled with +python or +python3.',
                             \ '"lint, rope, run, doc, virtualenv" features disabled.', ''])
 
         else
 
-            call append('$', ['WARNING: ', 'Python is disabled by `pymode_python` option.',
+            call append('$', ['WARNING: Python is disabled by `pymode_python` option.',
                             \ '"lint, rope, run, doc, virtualenv" features disabled.', ''])
 
         endif
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -6,7 +6,7 @@
     (__)   (__)  (__) (_) (_)(_____)(_)\_)   (_/\/\_)(_____)(____/(____)     ~
 
 
-                          Version: 0.8.0
+                          Version: 0.8.1
 
 ==============================================================================
 CONTENTS                                                       *pymode-contents*
diff --git a/plugin/pymode.vim b/plugin/pymode.vim
@@ -1,5 +1,5 @@
 " vi: fdl=1 
-let g:pymode_version = "0.8.0"
+let g:pymode_version = "0.8.1"
 
 com! PymodeVersion echomsg "Current python-mode version: " . g:pymode_version
 com! PymodeTroubleshooting call pymode#troubleshooting#test()
diff --git a/pymode/__init__.py b/pymode/__init__.py
@@ -29,10 +29,7 @@ class Options(object):
 
 def get_documentation():
     """ Search documentation and append to current buffer. """
-    try:
-        from StringIO import StringIO
-    except ImportError:
-        from io import StringIO
+    from ._compat import StringIO
 
     sys.stdout, _ = StringIO(), sys.stdout
     help(vim.eval('a:word'))
diff --git a/pymode/_compat.py b/pymode/_compat.py
@@ -0,0 +1,98 @@
+""" Compatibility.
+
+    Some py2/py3 compatibility support based on a stripped down
+    version of six so we don't have to depend on a specific version
+    of it.
+
+    :copyright: (c) 2014 by Armin Ronacher.
+    :license: BSD
+"""
+import sys
+
+PY2 = sys.version_info[0] == 2
+_identity = lambda x: x
+
+
+if not PY2:
+    text_type = str
+    string_types = (str,)
+    integer_types = (int, )
+
+    iterkeys = lambda d: iter(d.keys())
+    itervalues = lambda d: iter(d.values())
+    iteritems = lambda d: iter(d.items())
+
+    from io import StringIO
+    from queue import Queue # noqa
+
+    def reraise(tp, value, tb=None):
+        if value.__traceback__ is not tb:
+            raise value.with_traceback(tb)
+        raise value
+
+    implements_to_string = _identity
+
+else:
+    text_type = unicode
+    string_types = (str, unicode)
+    integer_types = (int, long)
+
+    iterkeys = lambda d: d.iterkeys()
+    itervalues = lambda d: d.itervalues()
+    iteritems = lambda d: d.iteritems()
+
+    from cStringIO import StringIO
+    from Queue import Queue
+
+    exec('def reraise(tp, value, tb=None):\n raise tp, value, tb')
+
+    def implements_to_string(cls):
+        cls.__unicode__ = cls.__str__
+        cls.__str__ = lambda x: x.__unicode__().encode('utf-8')
+        return cls
+
+
+def with_metaclass(meta, *bases):
+    # This requires a bit of explanation: the basic idea is to make a
+    # dummy metaclass for one level of class instantiation that replaces
+    # itself with the actual metaclass.  Because of internal type checks
+    # we also need to make sure that we downgrade the custom metaclass
+    # for one level to something closer to type (that's why __call__ and
+    # __init__ comes back from type etc.).
+    #
+    # This has the advantage over six.with_metaclass in that it does not
+    # introduce dummy classes into the final MRO.
+    class metaclass(meta):
+        __call__ = type.__call__
+        __init__ = type.__init__
+        def __new__(cls, name, this_bases, d):
+            if this_bases is None:
+                return type.__new__(cls, name, (), d)
+            return meta(name, bases, d)
+    return metaclass('temporary_class', None, {})
+
+
+# Certain versions of pypy have a bug where clearing the exception stack
+# breaks the __exit__ function in a very peculiar way.  This is currently
+# true for pypy 2.2.1 for instance.  The second level of exception blocks
+# is necessary because pypy seems to forget to check if an exception
+# happend until the next bytecode instruction?
+BROKEN_PYPY_CTXMGR_EXIT = False
+if hasattr(sys, 'pypy_version_info'):
+    class _Mgr(object):
+        def __enter__(self):
+            return self
+        def __exit__(self, *args):
+            sys.exc_clear()
+    try:
+        try:
+            with _Mgr():
+                raise AssertionError()
+        except:
+            raise
+    except TypeError:
+        BROKEN_PYPY_CTXMGR_EXIT = True
+    except AssertionError:
+        pass
+
+# pylama:skip=1
diff --git a/pymode/async.py b/pymode/async.py
@@ -1,9 +1,6 @@
 """ Python-mode async support. """
 
-try:
-    from Queue import Queue
-except ImportError:
-    from queue import Queue # noqa
+from ._compat import Queue
 
 
 RESULTS = Queue()
diff --git a/pymode/environment.py b/pymode/environment.py
@@ -7,7 +7,7 @@
 import time
 import os.path
 
-from .utils import PY2
+from ._compat import PY2
 
 
 class VimPymodeEnviroment(object):
diff --git a/pymode/libs/pylama/__init__.py b/pymode/libs/pylama/__init__.py
@@ -5,7 +5,7 @@
 
 """
 
-__version__ = "3.3.2"
+__version__ = "5.0.1"
 __project__ = "pylama"
 __author__ = "Kirill Klenov <horneds@gmail.com>"
 __license__ = "GNU LGPL"
diff --git a/pymode/libs/pylama/config.py b/pymode/libs/pylama/config.py
@@ -1,7 +1,7 @@
 """ Parse arguments from command line and configuration files. """
 import fnmatch
 import sys
-from os import getcwd, path
+import os
 from re import compile as re
 
 import logging
@@ -21,8 +21,11 @@
 #: A default checkers
 DEFAULT_LINTERS = 'pep8', 'pyflakes', 'mccabe'
 
-CURDIR = getcwd()
-DEFAULT_INI_PATH = path.join(CURDIR, 'pylama.ini')
+CURDIR = os.getcwd()
+CONFIG_FILES = [
+    os.path.join(CURDIR, basename) for basename in
+    ('pylama.ini', 'setup.cfg', 'tox.ini', 'pytest.ini')
+]
 
 
 class _Default(object):
@@ -67,7 +70,7 @@ def parse_linters(linters):
 PARSER = ArgumentParser(description="Code audit tool for python.")
 PARSER.add_argument(
     "path", nargs='?', default=_Default(CURDIR),
-    help="Path on file or directory.")
+    help="Path on file or directory for code check.")
 
 PARSER.add_argument(
     "--verbose", "-v", action='store_true', help="Verbose mode.")
@@ -77,11 +80,11 @@ def parse_linters(linters):
 
 PARSER.add_argument(
     "--format", "-f", default=_Default('pep8'), choices=['pep8', 'pylint'],
-    help="Error format.")
+    help="Choose errors format (pep8, pylint).")
 
 PARSER.add_argument(
     "--select", "-s", default=_Default(''), type=split_csp_str,
-    help="Select errors and warnings. (comma-separated)")
+    help="Select errors and warnings. (comma-separated list)")
 
 
 PARSER.add_argument(
@@ -100,7 +103,7 @@ def parse_linters(linters):
     type=lambda s: [re(fnmatch.translate(p)) for p in s.split(',') if p],
     help="Skip files by masks (comma-separated, Ex. */messages.py)")
 
-PARSER.add_argument("--report", "-r", help="Filename for report.")
+PARSER.add_argument("--report", "-r", help="Send report to file [REPORT]")
 PARSER.add_argument(
     "--hook", action="store_true", help="Install Git (Mercurial) hook.")
 
@@ -110,7 +113,7 @@ def parse_linters(linters):
     "Dont supported with pylint.")
 
 PARSER.add_argument(
-    "--options", "-o", default=_Default(DEFAULT_INI_PATH),
+    "--options", "-o", default="",
     help="Select configuration file. By default is '<CURDIR>/pylama.ini'")
 
 PARSER.add_argument(
@@ -151,17 +154,22 @@ def parse_options(args=None, config=True, **overrides): # noqa
                 setattr(options, k, _Default(v))
 
         # Parse file related options
-        for k, s in cfg.sections.items():
-            if k == cfg.default_section:
+        for name, opts in cfg.sections.items():
+
+            if not name.startswith('pylama'):
+                continue
+
+            if name == cfg.default_section:
                 continue
-            if k in LINTERS:
-                options.linter_params[k] = dict(s)
+
+            name = name[7:]
+
+            if name in LINTERS:
+                options.linter_params[name] = dict(opts)
                 continue
-            mask = re(fnmatch.translate(k))
-            options.file_params[mask] = dict(s)
-            options.file_params[mask]['lint'] = int(
-                options.file_params[mask].get('lint', 1)
-            )
+
+            mask = re(fnmatch.translate(name))
+            options.file_params[mask] = dict(opts)
 
     # Postprocess options
     opts = dict(options.__dict__.items())
@@ -187,15 +195,21 @@ def process_value(name, value):
     return value
 
 
-def get_config(ini_path=DEFAULT_INI_PATH):
+def get_config(ini_path=None):
     """ Load configuration from INI.
 
     :return Namespace:
 
     """
     config = Namespace()
-    config.default_section = 'main'
-    config.read(ini_path)
+    config.default_section = 'pylama'
+
+    if not ini_path:
+        for path in CONFIG_FILES:
+            if os.path.isfile(path) and os.access(path, os.R_OK):
+                config.read(path)
+    else:
+        config.read(ini_path)
 
     return config
 
@@ -207,3 +221,5 @@ def setup_logger(options):
         LOGGER.removeHandler(STREAM)
         LOGGER.addHandler(logging.FileHandler(options.report, mode='w'))
     LOGGER.info('Try to read configuration from: ' + options.options)
+
+# pylama:ignore=W0212
diff --git a/pymode/libs/pylama/errors.py b/pymode/libs/pylama/errors.py
@@ -32,6 +32,9 @@
     # multiple statements on one line
     [('pylint', 'C0321'), ('pep8', 'E702')],
 
+    # bad indentation
+    [('pylint', 'W0311'), ('pep8', 'E111')],
+
 )
 
 DUPLICATES = dict((key, values) for values in DUPLICATES for key in values)
@@ -57,6 +60,10 @@ def __getattr__(self, name):
     def __getitem__(self, name):
         return self._info[name]
 
+    def get(self, name, default=None):
+        """ Implement dictionary `get` method. """
+        return self._info.get(name, default)
+
     def __repr__(self):
         return "<Error: %s %s>" % (self.number, self.linter)
 
diff --git a/pymode/libs/pylama/libs/inirama.py b/pymode/libs/pylama/libs/inirama.py
diff --git a/pymode/libs/pylama/pytest.py b/pymode/libs/pylama/pytest.py
diff --git a/pymode/rope.py b/pymode/rope.py
diff --git a/pymode/run.py b/pymode/run.py
diff --git a/pymode/utils.py b/pymode/utils.py
