Merge branch 'release/0.6.16'

Author: klen

Changelog.rst

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+## 2013-04-26 0.6.16
+--------------------
+* Improvement folding (thanks @alvinfrancis);
+
+## 2013-04-01 0.6.15
+--------------------
+* Bugfix release
+
 ## 2013-03-16 0.6.14
 --------------------
 * Update `PEP8` to version 1.4.5;

README.rst

@@ -96,7 +96,7 @@ Then rebuild **helptags** in vim::
 Troubleshooting
 ===============
 
-If your python-mode dont work, type command: ::
+If your python-mode dont work, open any python file and type command: ::
 
     :call pymode#troubleshooting#Test()
 

autoload/pymode.vim

@@ -50,18 +50,24 @@ fun! pymode#QuickfixOpen(onlyRecognized, holdCursor, maxHeight, minHeight, jumpE
 endfunction "}}}
 
 
-fun! pymode#PlaceSigns() "{{{
+fun! pymode#PlaceSigns(bnum) "{{{
     " DESC: Place error signs
     "
     if has('signs')
-        sign unplace *
+        call pymode#Default('b:pymode_signs', [])
+
+        for item in b:pymode_signs
+            execute printf('sign unplace %d buffer=%d', item.lnum, item.bufnr)
+        endfor
+        let b:pymode_signs = []
 
         if !pymode#Default("g:pymode_lint_signs_always_visible", 0) || g:pymode_lint_signs_always_visible
             call RopeShowSignsRulerIfNeeded()
         endif
 
         for item in filter(getqflist(), 'v:val.bufnr != ""')
-            execute printf('silent! sign place 1 line=%d name=%s buffer=%d', item.lnum, item.type, item.bufnr)
+            call add(b:pymode_signs, item)
+            execute printf('sign place %d line=%d name=%s buffer=%d', item.lnum, item.lnum, "Pymode".item.type, item.bufnr)
         endfor
 
     endif

autoload/pymode/folding.vim

@@ -2,12 +2,16 @@
 
 
 let s:blank_regex = '^\s*$'
-let s:def_regex = '^\s*\(class\|def\) \w\+'
+let s:def_regex = '^\s*\%(class\|def\) \w\+'
+let s:decorator_regex = '^\s*@'
+let s:doc_begin_regex = '^\s*\%("""\|''''''\)'
+let s:doc_end_regex = '\%("""\|''''''\)\s*$'
+let s:doc_line_regex = '^\s*\("""\|''''''\).\+\1\s*$'
 
 
 fun! pymode#folding#text() " {{{
     let fs = v:foldstart
-    while getline(fs) =~ '^\s*@' 
+    while getline(fs) =~ '\%(^\s*@\)\|\%(^\s*\%("""\|''''''\)\s*$\)'
         let fs = nextnonblank(fs + 1)
     endwhile
     let line = getline(fs)
@@ -21,6 +25,7 @@ fun! pymode#folding#text() " {{{
     let line = substitute(line, '\t', onetab, 'g')
 
     let line = strpart(line, 0, windowwidth - 2 -len(foldedlinecount))
+    let line = substitute(line, '\%("""\|''''''\)', '', '')
     let fillcharcount = windowwidth - len(line) - len(foldedlinecount)
     return line . '…' . repeat(" ",fillcharcount) . foldedlinecount . '…' . ' '
 endfunction "}}}
@@ -30,21 +35,32 @@ fun! pymode#folding#expr(lnum) "{{{
 
     let line = getline(a:lnum)
     let indent = indent(a:lnum)
+	let prev_line = getline(a:lnum - 1)
+
+    if line =~ s:def_regex || line =~ s:decorator_regex
+		if prev_line =~ s:decorator_regex
+			return '='
+		else
+			return ">".(indent / &shiftwidth + 1)
+		endif
+    endif
 
-    if line =~ s:def_regex
-        return ">".(indent / &shiftwidth + 1)
+    if line =~ s:doc_begin_regex
+				\ && line !~ s:doc_line_regex
+				\ && prev_line =~ s:def_regex
+		return ">".(indent / &shiftwidth + 1)
     endif
 
-    if line =~ '^\s*@'
-        return -1
+    if line =~ s:doc_end_regex
+				\ && line !~ s:doc_line_regex
+		return "<".(indent / &shiftwidth + 1)
     endif
 
     if line =~ s:blank_regex
-        let prev_line = getline(a:lnum - 1)
         if prev_line =~ s:blank_regex
             return -1
         else
-            return foldlevel(prevnonblank(a:lnum))
+            return '='
         endif
     endif
 

autoload/pymode/lint.vim

@@ -20,13 +20,13 @@ fun! pymode#lint#Check() "{{{
 endfunction " }}}
 
 
-fun! pymode#lint#Parse()
+fun! pymode#lint#Parse(bnum)
     " DESC: Parse result of code checking.
     "
     call setqflist(g:qf_list, 'r')
 
     if g:pymode_lint_signs
-        call pymode#PlaceSigns()
+        call pymode#PlaceSigns(a:bnum)
     endif
 
     if g:pymode_lint_cwindow

doc/pymode.txt

@@ -6,7 +6,7 @@
    (__)   (__)  (__) (_) (_)(_____)(_)\_)   (_/\/\_)(_____)(____/(____)     ~
 
 
-                          Version: 0.6.14
+                          Version: 0.6.16
 
 ==============================================================================
 CONTENTS                                                  *Python-mode-contents*
@@ -29,7 +29,7 @@ Python-mode is a vim plugin that allows you to use the pylint, rope, and pydoc
 libraries in vim to provide features like python code bug checking,
 refactoring, and some other useful things.
 
-This plugin allow you create python code in vim very easily. There is no need
+This plugin allows you to create python code in vim very easily. There is no need
 to install the pylint or rope libraries on your system.
 
 
@@ -122,9 +122,9 @@ To enable any of the options below you should put the given line in your
 2.2. Modeline ~
                                                       *PythonModeModeline*
 
-Feature like VIM modeline `:help modeline`. Allow changing pymode options for
-edited file. Pymode modeline should always be the last line in the file and
-look like:
+The VIM modeline `:help modeline` feature allows you to change pymode 
+options for the current file. Pymode modeline should always be the
+last line in the vimrc file and look like:
 
 >
     # pymode:lint_ignore=E0202:doc=0:lint_write=0
@@ -142,7 +142,7 @@ Set linters and mccabe complexity.
     # pymode:lint_checker=pip,mccabe:lint_mccabe_complexity=10
 <
 
-This changes will work only in current buffer.
+These changes will work only in the current buffer.
 
 ------------------------------------------------------------------------------
                                                                       *'pymode'*
@@ -156,7 +156,7 @@ If this option is set to 0 then the whole plugin is disabled
 Values: List of strings
 Default: [].
 
-This option set additional python import paths
+This option sets additional python import paths
 
 ------------------------------------------------------------------------------
                                                                   *'pymode_doc'*
@@ -169,20 +169,20 @@ If this option is set to 0 then the doc script is disabled.
                                                               *'pymode_doc_key'*
 Default: 'K'.
 
-Set key for show python documentation.
+Set the key to show the show python documentation.
 
 ------------------------------------------------------------------------------
                                                                   *'pymode_run'*
 Values: 0 or 1.
 Default: 1.
 
-If this option is set to 0 then run script is disabled.
+If this option is set to 0 then the run script is disabled.
 
 ------------------------------------------------------------------------------
                                                               *'pymode_run_key'*
 Default: '<leader>r'.
 
-Set key for run python code.
+Set the key for running python code.
 
 ------------------------------------------------------------------------------
                                                                  *'pymode_lint'*
@@ -279,7 +279,7 @@ Values: 0 or 1.
 Default: 0.
 
 If this option is set to 0 then pylint will switch on the quickfix window when
-it opens. Doesn't work when |'pymode_lint_jump'| enabled.
+it opens. Doesn't work when |'pymode_lint_jump'| is enabled.
 
 ------------------------------------------------------------------------------
                                                        *'pymode_lint_minheight'*
@@ -349,7 +349,7 @@ not be used.
 Values: 0 or 1.
 Default: 1.
 
-If this option is set to 1, pymode will enable python indentation support
+If this option is set to 1, pymode will enable python indentation support.
 
 ------------------------------------------------------------------------------
                                                               *'pymode_folding'*
@@ -452,8 +452,8 @@ iM                Operation with inner function or method.
 Python-mode doesn't work
 ------------------------
 
-Run ":call pymode#troubleshooting#Test()" and fix the warning or send me the
-output.
+Open any python file and run ":call pymode#troubleshooting#Test()",
+fix the warning or send me the output.
 
 
 Rope completion is very slow
@@ -463,8 +463,8 @@ To work, rope_ creates a service directory: `.ropeproject`.  If
 |'pymode_rope_guess_project'| is set on (as it is by default) and
 `.ropeproject` is not found in the current dir, rope will scan for
 `.ropeproject` in every dir in the parent path.  If rope finds `.ropeproject`
-in parent dirs, rope sets project for all child dir and the scan may be slow
-for many dirs and files.
+in parent dirs, rope sets projectis for all child dirs and the scan may be 
+slow for many dirs and files.
 
 Solutions:
 
@@ -479,7 +479,7 @@ Solutions:
 Pylint check is very slow
 -------------------------
 
-In some projects pylint_ may check slowly, because it also scan imported
+In some projects pylint_ may check slowly, because it also scans imported
 modules if possible.  Try using pyflakes: see |'pymode_lint_checker'|.
 
 You may set |exrc| and |secure| in your |vimrc| to auto-set custom settings

ftplugin/python/init-pymode.vim

@@ -3,7 +3,7 @@ if exists('did_init_pymode_vim')
 endif
 let did_init_pymode_vim = 1
 
-let g:pymode_version = "0.6.14"
+let g:pymode_version = "0.6.16"
 
 com! PymodeVersion echomsg "Current python-mode version: " . g:pymode_version
 
@@ -111,11 +111,12 @@ if !pymode#Default("g:pymode_lint", 1) || g:pymode_lint
     if (!pymode#Default("g:pymode_lint_signs", 1) || g:pymode_lint_signs) && has('signs')
 
         " DESC: Signs definition
-        sign define W text=WW texthl=Todo
-        sign define C text=CC texthl=Comment
-        sign define R text=RR texthl=Visual
-        sign define E text=EE texthl=Error
-        sign define I text=II texthl=Info
+        sign define PymodeW text=WW texthl=Todo
+        sign define PymodeC text=CC texthl=Comment
+        sign define PymodeR text=RR texthl=Visual
+        sign define PymodeE text=EE texthl=Error
+        sign define PymodeI text=II texthl=Info
+        sign define PymodeF text=FF texthl=Info
 
         if !pymode#Default("g:pymode_lint_signs_always_visible", 0) || g:pymode_lint_signs_always_visible
             " Show the sign's ruller if asked for, even it there's no error to show
@@ -127,7 +128,7 @@ if !pymode#Default("g:pymode_lint", 1) || g:pymode_lint
 
     " DESC: Set default pylint configuration
     if !filereadable(g:pymode_lint_config)
-        let g:pymode_lint_config = expand("<sfile>:p:h:h") . "/pylint.ini"
+        let g:pymode_lint_config = expand("<sfile>:p:h:h:h") . "/pylint.ini"
     endif
 
     py from pymode import queue

pylibs/pylama/__init__.py

@@ -1,6 +1,6 @@
 " pylama -- Python code audit. "
 
-version_info = (0, 2, 3)
+version_info = (0, 3, 0)
 
 __version__ = version = '.'.join(map(str, version_info))
 __project__ = __name__

pylibs/pylama/hook.py

@@ -0,0 +1,88 @@
+import sys
+from os import path as op, chmod
+from subprocess import Popen, PIPE
+from .main import logger
+
+
+try:
+    from configparser import ConfigParser # nolint
+except ImportError:   # Python 2
+    from ConfigParser import ConfigParser
+
+
+def run(command):
+    p = Popen(command.split(), stdout=PIPE, stderr=PIPE)
+    (stdout, stderr) = p.communicate()
+    return (p.returncode, [line.strip() for line in stdout.splitlines()],
+            [line.strip() for line in stderr.splitlines()])
+
+
+def git_hook():
+    from .main import check_files
+    _, files_modified, _ = run("git diff-index --cached --name-only HEAD")
+    logger.setLevel('WARN')
+    check_files([f for f in map(str, files_modified) if f.endswith('.py')])
+
+
+def hg_hook(ui, repo, **kwargs):
+    from .main import check_files
+    seen = set()
+    paths = []
+    for rev in range(repo[kwargs['node']], len(repo)):
+        for file_ in repo[rev].files():
+            file_ = op.join(repo.root, file_)
+            if file_ in seen or not op.exists(file_):
+                continue
+            seen.add(file_)
+            if file_.endswith('.py'):
+                paths.append(file_)
+    logger.setLevel('WARN')
+    check_files(paths)
+
+
+def install_git(path):
+    hook = op.join(path, 'pre-commit')
+    with open(hook, 'w+') as fd:
+        fd.write("""#!/usr/bin/env python
+import sys
+from pylama.hook import git_hook
+
+if __name__ == '__main__':
+    sys.exit(git_hook())
+""")
+    chmod(hook, 484)
+    return True
+
+
+def install_hg(path):
+    hook = op.join(path, 'hgrc')
+    if not op.isfile(hook):
+        open(hook, 'w+').close()
+
+    c = ConfigParser()
+    c.readfp(open(path, 'r'))
+    if not c.has_section('hooks'):
+        c.add_section('hooks')
+
+    if not c.has_option('hooks', 'commit'):
+        c.set('hooks', 'commit', 'python:pylama.hooks.hg_hook')
+
+    if not c.has_option('hooks', 'qrefresh'):
+        c.set('hooks', 'qrefresh', 'python:pylama.hooks.hg_hook')
+
+    c.write(open(path, 'w+'))
+    return True
+
+
+def install_hook(path):
+    git = op.join(path, '.git', 'hooks')
+    hg = op.join(path, '.hg')
+    if op.exists(git):
+        install_git(git) and logger.warn('Git hook has been installed.') # nolint
+
+    elif op.exists(hg):
+        install_hg(git) and logger.warn('Mercurial hook has been installed.') # nolint
+
+    else:
+        logger.error('VCS has not found. Check your path.')
+        sys.exit(1)