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

Author: vim-IDE

AUTHORS

@@ -33,10 +33,13 @@ Contributors:
 * 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);
+* Robin Schneider (https://github.com/ypid)
 * Ronald Andreu Kaiser (http://github.com/cathoderay);
 * Samir Benmendil (https://github.com/Ram-Z)
 * Sorin Ionescu (sorin-ionescu);

Changelog.rst

@@ -3,11 +3,17 @@ 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

@@ -33,10 +33,10 @@ 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

autoload/pymode/folding.vim

@@ -51,7 +51,7 @@ fun! pymode#folding#expr(lnum) "{{{
 
     if line =~ s:def_regex
         " single line def
-        if indent(a:lnum) >= indent(a:lnum+1)
+        if indent(a:lnum) >= indent(a:lnum+1) && getline(prevnonblank(a:lnum)) !~ ':\s*$'
             return '='
         endif
         " Check if last decorator is before the last def