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

Author: krader1961

AUTHORS

@@ -16,6 +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);
 * Dirk Wallenstein (http://github.com/dirkwallenstein);
 * Florent Xicluna (http://github.com/florentx);
 * Fredrik Henrysson (http://github.com/fhenrysson);
@@ -25,24 +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);
 * 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);
-* Ronald Andreu Kaiser (http://github.com/cathoderay);
+* 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)
-* 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;

Changelog.rst

@@ -2,11 +2,19 @@ Changelog
 =========
 
 * Pylama updated to version 5.0.5
+* Rope libs updated
+* Add wdb to debugger list in breakpoint cmd
 * Add 'pymode_options_max_line_length' option
 * Add ability to set related checker options `:help pymode-lint-options`
   Options added: 'pymode_lint_options_pep8', 'pymode_lint_options_pep257',
   'pymode_lint_options_mccabe', 'pymode_lint_options_pyflakes',
   'pymode_lint_options_pylint'
+* Highlight comments inside class/function arg lists
+* Don't fold single line def
+* Don't skip a line when the first docstring contains text
+* Add Python documentation vertical display option
+* Rope: correct refactoring function calls
+
 
 ## 2014-06-11 0.8.1
 -------------------

Makefile

@@ -26,11 +26,17 @@ pylama:
 	make $(PYLAMA)
 	make $(PYLAMA)/lint/pylama_pylint
 
+.PHONY: rope
+rope:
+	@git clone https://github.com/python-rope/rope.git $(CURDIR)/_/rope
+	@rm -rf $(CURDIR)/pymode/libs/rope
+	@cp -r $(CURDIR)/_/rope/rope $(CURDIR)/pymode/libs/.
+
 $(PYLAMA):
-	cp -r ~/Dropbox/projects/pylama/pylama $(PYLAMA)
+	cp -r $$PRJDIR/pylama/pylama $(PYLAMA)
 
 $(PYLAMA)/lint/pylama_pylint:
-	cp -r ~/Dropbox/projects/pylama/plugins/pylama_pylint/pylama_pylint/ $(PYLAMA)/lint/pylama_pylint
+	cp -r $$PRJDIR/pylama/plugins/pylama_pylint/pylama_pylint/ $(PYLAMA)/lint/pylama_pylint
 
 $(CURDIR)/build:
 	mkdir -p $(CURDIR)/build/usr/share/vim/addons

README.rst

@@ -40,7 +40,7 @@ See (very old) screencast here: http://www.youtube.com/watch?v=67OZNp9Z0CQ
 (sorry for quality, this is my first screencast) Another old presentation here:
 http://www.youtube.com/watch?v=YhqsjUUHj6g
 
-**To read python-mode documentation in Vim, see** ``:help pymode.txt``
+**To read python-mode documentation in Vim, see** ``:help pymode``
 
 
 .. contents::
@@ -62,7 +62,7 @@ Using pathogen (recommended)
 
     % cd ~/.vim
     % mkdir -p bundle && cd bundle
-    % git clone git://github.com/klen/python-mode.git
+    % git clone https://github.com/klen/python-mode.git
 
 - Enable `pathogen <https://github.com/tpope/vim-pathogen>`_
   in your ``~/.vimrc``: ::
@@ -81,7 +81,7 @@ Manually
 --------
 ::
 
-    % git clone git://github.com/klen/python-mode.git
+    % git clone https://github.com/klen/python-mode.git
     % cd python-mode
     % cp -R * ~/.vim
 
@@ -187,8 +187,8 @@ License
 
 Licensed under a `GNU lesser general public license`_.
 
-If you like this plugin, you can send me postcard :)
-My address is here: "Russia, 143401, Krasnogorsk, Shkolnaya 1-19" to "Kirill Klenov".
+If you like this plugin, I would very appreciated if you kindly send me a postcard :)
+My address is here: "Russia, 143500, MO, Istra, pos. Severny 8-3" to "Kirill Klenov".
 **Thanks for support!**
 
 .. _GNU lesser general public license: http://www.gnu.org/copyleft/lesser.html

autoload/pymode.vim

@@ -12,13 +12,6 @@ endfunction "}}}
 " DESC: Import python libs
 fun! pymode#init(plugin_root, paths) "{{{
 
-    if g:pymode_python == 'disable'
-        if g:pymode_warning
-            call pymode#error("Pymode requires vim compiled with +python. Most of features will be disabled.")
-        endif
-        return
-    endif
-
     PymodePython import sys, vim
     PymodePython sys.path.insert(0, vim.eval('a:plugin_root'))
     PymodePython sys.path = vim.eval('a:paths') + sys.path
@@ -76,9 +69,11 @@ endfunction "}}}
 
 " DESC: Remove unused whitespaces
 fun! pymode#trim_whitespaces() "{{{
-    let cursor_pos = getpos('.')
-    silent! %s/\s\+$//
-    call setpos('.', cursor_pos)
+    if g:pymode_trim_whitespaces
+        let cursor_pos = getpos('.')
+        silent! %s/\s\+$//
+        call setpos('.', cursor_pos)
+    endif
 endfunction "}}}
 
 
@@ -107,11 +102,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/breakpoint.vim

@@ -17,7 +17,7 @@ fun! pymode#breakpoint#init() "{{{
 
 from imp import find_module
 
-for module in ('pudb', 'ipdb'):
+for module in ('wdb', 'pudb', 'ipdb'):
     try:
         find_module(module)
         vim.command('let g:pymode_breakpoint_cmd = "import %s; %s.set_trace()  # XXX BREAKPOINT"' % (module, module))

autoload/pymode/doc.vim

@@ -29,6 +29,9 @@ fun! pymode#doc#show(word) "{{{
     setlocal nomodifiable
     setlocal nomodified
     setlocal filetype=rst
+    if g:pymode_doc_vertical
+        wincmd L
+    endif
     wincmd p
 
 endfunction "}}}

autoload/pymode/folding.vim

@@ -18,7 +18,7 @@ fun! pymode#folding#text() " {{{
     while getline(fs) !~ s:def_regex && getline(fs) !~ s:doc_begin_regex
         let fs = nextnonblank(fs + 1)
     endwhile
-    if getline(fs) =~ s:doc_begin_regex
+    if getline(fs) =~ s:doc_end_regex && getline(fs) =~ s:doc_begin_regex
         let fs = nextnonblank(fs + 1)
     endif
     let line = getline(fs)
@@ -50,6 +50,10 @@ fun! pymode#folding#expr(lnum) "{{{
     endif
 
     if line =~ s:def_regex
+        " single line def
+        if indent(a:lnum) >= indent(a:lnum+1) && getline(prevnonblank(a:lnum)) !~ ':\s*$'
+            return '='
+        endif
         " Check if last decorator is before the last def
         let decorated = 0
         let lnum = a:lnum - 1

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)

autoload/pymode/lint.vim

@@ -65,9 +65,7 @@ fun! pymode#lint#check() "{{{
 
     call g:PymodeSigns.refresh(loclist)
 
-    if g:pymode_lint_cwindow
-        call loclist.show()
-    endif
+    call loclist.show()
 
     call pymode#lint#show_errormessage()
     call pymode#wide_message('Found errors and warnings: ' . len(loclist._loclist))

autoload/pymode/run.vim

@@ -43,8 +43,6 @@ let s:efm .= '%-G%.%#'
 
 PymodePython from pymode.run import run_code
 
-call pymode#tools#loclist#init()
-
 
 " DESC: Run python code
 fun! pymode#run#code_run(line1, line2) "{{{
@@ -88,10 +86,7 @@ fun! pymode#run#code_run(line1, line2) "{{{
             call setqflist(qflist)
         endif
 
-        let loclist = g:PymodeLocList.current()
-        let loclist._loclist = getqflist()
-        let loclist._title = "Run errors"
-        call loclist.show()
+        call pymode#quickfix_open(0, g:pymode_quickfix_maxheight, g:pymode_quickfix_maxheight, 0)
 
         let &efm = l:_efm
 

autoload/pymode/tools/loclist.vim

@@ -68,7 +68,7 @@ fun! g:PymodeLocList.show() "{{{
     call setloclist(0, self._loclist)
     if self.is_empty()
         lclose
-    else
+    elseif g:pymode_lint_cwindow
         let num = winnr()
         lopen
         setl nowrap

doc/pymode.txt

@@ -98,10 +98,6 @@ Setup default python options                                *'g:pymode_options'*
 >
     let g:pymode_options = 1
 
-Setup max line length                       *'g:pymode_options_max_line_length'*
->
-    let g:pymode_options_max_line_length = 79
-
 If this option is set to 1, pymode will enable the following options for
 python buffers: >
 
@@ -115,6 +111,10 @@ python buffers: >
     setlocal commentstring=#%s
     setlocal define=^\s*\\(def\\\\|class\\)
 
+Setup max line length                       *'g:pymode_options_max_line_length'*
+>
+    let g:pymode_options_max_line_length = 79
+
 Enable colorcolumn display at max_line_length   *'g:pymode_options_colorcolumn'*
 >
     let g:pymode_options_colorcolumn = 1
@@ -482,7 +482,7 @@ Keymap for autocomplete                        *'g:pymode_rope_completion_bind'*
 Extended autocompletion (rope could complete objects which have not been
 imported) from project                              *'g:pymode_rope_autoimport'*
 >
-    let g:pymode_rope_autoimport = 1
+    let g:pymode_rope_autoimport = 0
 
 Load modules to autoimport by default       *'g:pymode_rope_autoimport_modules'*
 >
@@ -781,10 +781,10 @@ The sequence of commands that fixed this:
 Python-mode is released under the GNU lesser general public license.
 See: http://www.gnu.org/copyleft/lesser.html
 
-If you like this plugin, you can send me a postcard :)
+If you like this plugin, I would very appreciated if you kindly send me a postcard :)
 
-My address is: "Russia, 143401, Krasnogorsk, Shkolnaya 1-19" to "Kirill
-Klenov". Thanks for your support!
+My address is: "Russia, 143500, MO, Istra, pos. Severny 8-3" to "Kirill Klenov".
+Thanks for your support!
 
 
 ------------------------------------------------------------------------------

ftplugin/python/pymode.vim

@@ -2,15 +2,31 @@ if !g:pymode || pymode#default('b:pymode', 1)
     finish
 endif
 
+if g:pymode_python == 'disable'
+
+    if g:pymode_warning
+        call pymode#error("Pymode requires vim compiled with +python. Most of features will be disabled.")
+    endif
+
+    finish
+
+else
+
+
 let b:pymode_modified = &modified
 
 " Init paths
 if !pymode#default('g:pymode_init', 1)
-    call pymode#init(expand('<sfile>:p:h:h:h'), g:pymode_paths)
-    call pymode#virtualenv#init()
-    call pymode#breakpoint#init()
-    PymodePython from pymode.utils import patch_paths
-    PymodePython patch_paths()
+
+        call pymode#init(expand('<sfile>:p:h:h:h'), g:pymode_paths)
+        call pymode#virtualenv#init()
+        call pymode#breakpoint#init()
+
+        PymodePython from pymode.utils import patch_paths
+        PymodePython patch_paths()
+
+    endif
+
 endif
 
 command! -buffer -nargs=1 PymodeVirtualenv call pymode#virtualenv#activate(<args>)

plugin/pymode.vim

@@ -52,6 +52,9 @@ call pymode#default("g:pymode_options", 1)
 call pymode#default("g:pymode_options_max_line_length", 80)
 call pymode#default("g:pymode_options_colorcolumn", 1)
 
+" Enable/disable vertical display of python documentation
+call pymode#default("g:pymode_doc_vertical", 0)
+
 " Minimal height of pymode quickfix window
 call pymode#default('g:pymode_quickfix_maxheight', 6)
 
@@ -183,7 +186,7 @@ call pymode#default('g:pymode_rope_completion', 1)
 
 " Complete keywords from not imported modules (could make completion slower)
 " Enable autoimport used modules
-call pymode#default('g:pymode_rope_autoimport', 1)
+call pymode#default('g:pymode_rope_autoimport', 0)
 
 " Offer to import object after complete (if that not be imported before)
 call pymode#default('g:pymode_rope_autoimport_import_after_complete', 0)

pylama.ini

@@ -1,3 +1,8 @@
-[main]
-ignore = R0201,R0922,E1103
-skip = pymode/autopep8.py
+[pylama]
+linters=pep8,pyflakes,pylint
+
+[pylama:pymode/libs*]
+skip=1
+
+[pylama:pylint]
+disable=E1120,E1130,E1103,W1401