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

Author: dannywillems

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);
@@ -40,6 +41,7 @@ Contributors:
 * 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)

Changelog.rst

@@ -2,12 +2,14 @@ Changelog
 =========
 
 * Pylama updated to version 5.0.5
+* Rope libs updated
 * 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'
 
+
 ## 2014-06-11 0.8.1
 -------------------
 * Pylama updated to version 3.3.2

Makefile

@@ -26,6 +26,12 @@ 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)
 

README.rst

@@ -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/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)

doc/pymode.txt

@@ -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!
 
 
 ------------------------------------------------------------------------------

plugin/pymode.vim

@@ -183,7 +183,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

pymode/libs2/rope/__init__.py

@@ -1,7 +1,7 @@
 """rope, a python refactoring library"""
 
 INFO = __doc__
-VERSION = '0.9.4'
+VERSION = '0.10.2'
 COPYRIGHT = """\
 Copyright (C) 2006-2012 Ali Gholami Rudi
 Copyright (C) 2009-2012 Anton Gritsay

pymode/libs2/rope/base/arguments.py

@@ -72,6 +72,8 @@ def get_pynames(self, parameters):
 
     def get_instance_pyname(self):
         return self.pynames[0]
+
+
 class MixedArguments(object):
 
     def __init__(self, pyname, arguments, scope):