Update Rope

Author: klen

AUTHORS

@@ -40,11 +40,11 @@ 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)
 * lawrenceakka;
 * lee (loyalpartner);
 * nixon;
 * tramchamploo;
-* Tyler Fenby (https://github.com/TFenby)

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

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/base/default_config.py

@@ -13,8 +13,9 @@ def set_prefs(prefs):
     # '.svn': matches 'pkg/.svn' and all of its children
     # 'build/*.o': matches 'build/lib.o' but not 'build/sub/lib.o'
     # 'build//*.o': matches 'build/lib.o' and 'build/sub/lib.o'
-    prefs['ignored_resources'] = ['*.pyc', '*~', '.ropeproject',
-                                  '.hg', '.svn', '_svn', '.git', '.tox']
+    prefs['ignored_resources'] = [
+        '*.pyc', '*~', '.ropeproject', '.hg', '.svn', '_svn', '.git',
+        '.tox', '.env', 'node_modules', 'bower_components']
 
     # Specifies which files should be considered python files.  It is
     # useful when you have scripts inside your project.  Only files

pymode/libs3/rope/base/default_config.py

@@ -13,9 +13,9 @@ def set_prefs(prefs):
     # '.svn': matches 'pkg/.svn' and all of its children
     # 'build/*.o': matches 'build/lib.o' but not 'build/sub/lib.o'
     # 'build//*.o': matches 'build/lib.o' and 'build/sub/lib.o'
-    prefs['ignored_resources'] = ['*.pyc', '*~', '.ropeproject',
-                                  '.hg', '.svn', '_svn', '.git', 
-                                  '__pycache__']
+    prefs['ignored_resources'] = [
+        '*.pyc', '*~', '.ropeproject', '.hg', '.svn', '_svn', '.git',
+        '__pycache__', '.tox', '.env', 'node_modules', 'bower_components']
 
     # Specifies which files should be considered python files.  It is
     # useful when you have scripts inside your project.  Only files

pymode/rope.py

@@ -1,7 +1,6 @@
 """ Rope support in pymode. """
 from __future__ import absolute_import, print_function
 
-import multiprocessing
 import os.path
 import re
 import site
@@ -13,7 +12,6 @@
 from rope.contrib import autoimport as rope_autoimport, codeassist, findit, generate # noqa
 from rope.refactor import ModuleToPackage, ImportOrganizer, rename, extract, inline, usefunction, move, change_signature, importutils # noqa
 
-from ._compat import StringIO
 from .environment import env
 
 
@@ -352,8 +350,7 @@ def __init__(self, path, project_path):
         """ Init Rope context. """
         self.path = path
 
-        self.project = project.Project(
-            project_path, fscommands=FileSystemCommands())
+        self.project = project.Project(project_path, fscommands=FileSystemCommands())
 
         self.importer = rope_autoimport.AutoImport(
             project=self.project, observe=False)
@@ -462,8 +459,8 @@ def run(self):
 
                 action = env.user_input_choices(
                     'Choose what to do:', 'perform', 'preview',
-                        'perform in class hierarchy',
-                        'preview in class hierarchy')
+                    'perform in class hierarchy',
+                    'preview in class hierarchy')
 
                 in_hierarchy = action.endswith("in class hierarchy")
 
@@ -512,7 +509,7 @@ def get_changes(refactor, input_str, in_hierarchy=False):
         """
         progress = ProgressHandler('Calculate changes ...')
         return refactor.get_changes(
-            input_str, task_handle=progress.handle, in_hierarchy = in_hierarchy)
+            input_str, task_handle=progress.handle, in_hierarchy=in_hierarchy)
 
 
 class RenameRefactoring(Refactoring):
@@ -746,13 +743,12 @@ def get_refactor(ctx):
         return change_signature.ChangeSignature(
             ctx.project, ctx.resource, offset)
 
-    def get_changes(self, refactor, input_string):
+    def get_changes(self, refactor, input_string, in_hierarchy=False):
         """ Function description.
 
         :return Rope.changes:
 
         """
-
         args = re.sub(r'[\s\(\)]+', '', input_string).split(',')
         olds = [arg[0] for arg in refactor.get_args()]
 
@@ -793,7 +789,7 @@ def get_refactor(self, ctx):
         return generate.create_generate(
             self.kind, ctx.project, ctx.resource, offset)
 
-    def get_changes(self, refactor, input_str):
+    def get_changes(self, refactor, input_str, in_hierarchy=False):
         """ Function description.
 
         :return Rope.changes:
@@ -938,5 +934,3 @@ def _insert_import(name, module, ctx):
     progress = ProgressHandler('Apply changes ...')
     ctx.project.do(changes, task_handle=progress.handle)
     reload_changes(changes)
-
-# pylama:ignore=W1401,E1120,D