Merge branch 'develop' of https://github.com/klen/python-mode into develop

Author: dannywillems

AUTHORS

@@ -16,7 +16,7 @@ Contributors:
 * Daniel Hahler (http://github.com/blueyed)
 * David Vogt (http://github.com/winged);
 * Denis Kasak (http://github.com/dkasak);
-* Dimitrios Semitsoglou-Tsiapos (https://github.com/dset0x)
+* Dimitrios Semitsoglou-Tsiapos (https://github.com/dset0x);
 * Dirk Wallenstein (http://github.com/dirkwallenstein);
 * Florent Xicluna (http://github.com/florentx);
 * Fredrik Henrysson (http://github.com/fhenrysson);
@@ -26,29 +26,30 @@ Contributors:
 * Jay Rainey (https://github.com/jawrainey)
 * Jonathan McCall (http://github.com/Jonnymcc);
 * Kevin Deldycke (http://github.com/kdeldycke);
-* Kurtis Rader (https://github.com/krader1961)
+* Kurtis Rader (https://github.com/krader1961);
 * Lowe Thiderman (http://github.com/thiderman);
 * Martin Brochhaus (http://github.com/mbrochh);
 * Matthew Moses (http://github.com/mlmoses);
-* Mel Boyce (http://github.com/syngin)
+* Mel Boyce (http://github.com/syngin);
 * Mohammed (http://github.com/mbadran);
 * Naoya Inada (http://github.com/naoina);
-* Nate Zhang (https://github.com/natezhang93)
-* Paweł Korzeniewski (https://github.com/korzeniewskipl)
+* Nate Zhang (https://github.com/natezhang93);
+* Paweł Korzeniewski (https://github.com/korzeniewskipl);
 * Pedro Algarvio (http://github.com/s0undt3ch);
 * Phillip Cloud (http://github.com/cpcloud);
 * Piet Delport (http://github.com/pjdelport);
 * Robert David Grant (http://github.com/bgrant);
-* Robin Schneider (https://github.com/ypid)
-* Ronald Andreu Kaiser (http://github.com/cathoderay);
-* Samir Benmendil (https://github.com/Ram-Z)
+* Robin Schneider (https://github.com/ypid);
+* Ronald Andreu Kaiser (http://github.com/cathoderay);;
+* Samir Benmendil (https://github.com/Ram-Z);
 * Sorin Ionescu (sorin-ionescu);
 * Steve Losh (http://github.com/sjl);
-* Tommy Allen (https://github.com/tweekmonster)
-* Tyler Fenby (https://github.com/TFenby)
-* Wayne Ye (https://github.com/WayneYe)
-* bendavis78 (http://github.com/bendavis78)
-* fwuzju (http://github.com/fwuzju)
+* Tommy Allen (https://github.com/tweekmonster);
+* Tyler Fenby (https://github.com/TFenby);
+* Vincent Driessen (https://github.com/nvie);
+* Wayne Ye (https://github.com/WayneYe);
+* bendavis78 (http://github.com/bendavis78);
+* fwuzju (http://github.com/fwuzju);
 * lawrenceakka;
 * lee (loyalpartner);
 * nixon;

autoload/pymode.vim

@@ -109,11 +109,11 @@ endfunction "}}}
 
 fun! pymode#buffer_pre_write() "{{{
     let b:pymode_modified = &modified
-endfunction
+endfunction "}}}
 
 fun! pymode#buffer_post_write() "{{{
     if g:pymode_rope
-        if b:pymode_modified && g:pymode_rope_regenerate_on_write
+        if g:pymode_rope_regenerate_on_write && b:pymode_modified
             call pymode#debug('regenerate')
             call pymode#rope#regenerate()
         endif

autoload/pymode/indent.vim

@@ -110,7 +110,7 @@ function! s:SearchParensPair() " {{{
     " Skip strings and comments and don't look too far
     let skip = "line('.') < " . (line - 50) . " ? dummy :" .
                 \ 'synIDattr(synID(line("."), col("."), 0), "name") =~? ' .
-                \ '"string\\|comment"'
+                \ '"string\\|comment\\|doctest"'
 
     " Search for parentheses
     call cursor(line, col)

pymode/libs/logilab/__init__.py

@@ -0,0 +1 @@
+

pymode/libs/pylama/__init__.py

@@ -5,7 +5,7 @@
 :license: BSD, see LICENSE for more details.
 """
 
-__version__ = "7.0.3"
+__version__ = "7.0.4"
 __project__ = "pylama"
 __author__ = "Kirill Klenov <[email protected]>"
 __license__ = "GNU LGPL"

pymode/libs/pylama/core.py

@@ -21,10 +21,11 @@ def run(path='', code=None, rootdir=CURDIR, options=None):
     """
     errors = []
     fileconfig = dict()
-    lname = 'undefined'
-    params = dict()
     linters = LINTERS
     linters_params = dict()
+    lname = 'undefined'
+    params = dict()
+    path = op.relpath(path, rootdir)
 
     if options:
         linters = options.linters
@@ -35,7 +36,6 @@ def run(path='', code=None, rootdir=CURDIR, options=None):
 
     try:
         with CodeContext(code, path) as ctx:
-            path = op.relpath(path, rootdir)
             code = ctx.code
             params = prepare_params(parse_modeline(code), fileconfig, options)
             LOGGER.debug('Checking params: %s', params)
@@ -71,7 +71,7 @@ def run(path='', code=None, rootdir=CURDIR, options=None):
             Error(linter=lname, lnum=e.lineno, col=e.offset, text=e.args[0],
                   filename=path))
 
-    except Exception as e:
+    except Exception as e: # noqa
         import traceback
         LOGGER.info(traceback.format_exc())
 

pymode/lint.py

@@ -73,6 +73,8 @@ def __sort(e):
 
     for e in errors:
         e._info['bufnr'] = env.curbuf.number
+        if e._info['col'] is None:
+            e._info['col'] = 1
 
     env.run('g:PymodeLocList.current().extend', [e._info for e in errors])