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

Author: vim-IDE

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

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):

pymode/libs2/rope/base/builtins.py

@@ -149,8 +149,10 @@ def _get_builtin(*args):
         return cls._generated[args]
     return _get_builtin
 
+
 def _create_builtin_getter(cls):
     type_getter = _create_builtin_type_getter(cls)
+
     def _get_builtin(*args):
         return pyobjects.PyObject(type_getter(*args))
     return _get_builtin
@@ -233,7 +235,7 @@ def __call__(self, name, returned=None, function=None,
         except AttributeError:
             if check_existence:
                 raise
-            builtin=None
+            builtin = None
         self.attributes[name] = BuiltinName(
             BuiltinFunction(returned=returned, function=function,
                             argnames=argnames, builtin=builtin))
@@ -252,7 +254,8 @@ def __init__(self, holding=None):
         collector('__new__', function=self._new_list)
 
         # Adding methods
-        collector('append', function=self._list_add, argnames=['self', 'value'])
+        collector('append', function=self._list_add,
+                  argnames=['self', 'value'])
         collector('__setitem__', function=self._list_add,
                   argnames=['self', 'index', 'value'])
         collector('insert', function=self._list_add,
@@ -306,7 +309,6 @@ class Dict(BuiltinClass):
     def __init__(self, keys=None, values=None):
         self.keys = keys
         self.values = values
-        item = get_tuple(self.keys, self.values)
         collector = _AttributeCollector(dict)
         collector('__new__', function=self._new_dict)
         collector('__setitem__', function=self._dict_add)
@@ -327,7 +329,8 @@ def do_create(holding=None):
             if holding is None:
                 return get_dict()
             type = holding.get_type()
-            if isinstance(type, Tuple) and len(type.get_holding_objects()) == 2:
+            if isinstance(type, Tuple) and \
+                    len(type.get_holding_objects()) == 2:
                 return get_dict(*type.get_holding_objects())
         return _create_builtin(args, do_create)
 
@@ -384,7 +387,7 @@ def _self_set(self, context):
         if new_dict and isinstance(new_dict.get_object().get_type(), Dict):
             args = arguments.ObjectArguments([new_dict])
             items = new_dict.get_object()['popitem'].\
-                    get_object().get_returned_object(args)
+                get_object().get_returned_object(args)
             context.save_per_name(items)
         else:
             holding = _infer_sequence_for_pyname(new_dict)
@@ -405,7 +408,8 @@ def __init__(self, *objects):
             first = objects[0]
         attributes = {
             '__getitem__': BuiltinName(BuiltinFunction(first)),
-            '__getslice__': BuiltinName(BuiltinFunction(pyobjects.PyObject(self))),
+            '__getslice__':
+            BuiltinName(BuiltinFunction(pyobjects.PyObject(self))),
             '__new__': BuiltinName(BuiltinFunction(function=self._new_tuple)),
             '__iter__': BuiltinName(BuiltinFunction(get_iterator(first)))}
         super(Tuple, self).__init__(tuple, attributes)
@@ -485,8 +489,9 @@ def __init__(self):
 
         self_methods = ['__getitem__', '__getslice__', 'capitalize', 'center',
                         'decode', 'encode', 'expandtabs', 'join', 'ljust',
-                        'lower', 'lstrip', 'replace', 'rjust', 'rstrip', 'strip',
-                        'swapcase', 'title', 'translate', 'upper', 'zfill']
+                        'lower', 'lstrip', 'replace', 'rjust', 'rstrip',
+                        'strip', 'swapcase', 'title', 'translate', 'upper',
+                        'zfill']
         for method in self_methods:
             collector(method, self_object)
 
@@ -514,6 +519,7 @@ def get_object(self):
     def get_definition_location(self):
         return (None, None)
 
+
 class Iterator(pyobjects.AbstractClass):
 
     def __init__(self, holding=None):
@@ -539,7 +545,8 @@ def __init__(self, holding=None):
         self.holding = holding
         self.attributes = {
             'next': BuiltinName(BuiltinFunction(self.holding)),
-            '__iter__': BuiltinName(BuiltinFunction(get_iterator(self.holding))),
+            '__iter__': BuiltinName(BuiltinFunction(
+                get_iterator(self.holding))),
             'close': BuiltinName(BuiltinFunction()),
             'send': BuiltinName(BuiltinFunction()),
             'throw': BuiltinName(BuiltinFunction())}
@@ -556,10 +563,10 @@ def get_returned_object(self, args):
 class File(BuiltinClass):
 
     def __init__(self):
-        self_object = pyobjects.PyObject(self)
         str_object = get_str()
         str_list = get_list(get_str())
         attributes = {}
+
         def add(name, returned=None, function=None):
             builtin = getattr(file, name, None)
             attributes[name] = BuiltinName(
@@ -587,7 +594,8 @@ def __init__(self, fget=None, fset=None, fdel=None, fdoc=None):
             'fget': BuiltinName(BuiltinFunction()),
             'fset': BuiltinName(pynames.UnboundName()),
             'fdel': BuiltinName(pynames.UnboundName()),
-            '__new__': BuiltinName(BuiltinFunction(function=_property_function))}
+            '__new__': BuiltinName(
+                BuiltinFunction(function=_property_function))}
         super(Property, self).__init__(property, attributes)
 
     def get_property_object(self, args):
@@ -631,7 +639,7 @@ def get_attributes(self):
         return {}
 
     def get_name(self):
-        return  'lambda'
+        return 'lambda'
 
     def get_param_names(self, special_args=True):
         result = [node.id for node in self.arguments.args
@@ -671,7 +679,7 @@ def _infer_sequence_for_pyname(pyname):
         iter = obj.get_returned_object(args)
         if iter is not None and 'next' in iter:
             holding = iter['next'].get_object().\
-                      get_returned_object(args)
+                get_returned_object(args)
             return holding
 
 
@@ -690,12 +698,15 @@ def _create_builtin(args, creator):
 def _range_function(args):
     return get_list()
 
+
 def _reversed_function(args):
     return _create_builtin(args, get_iterator)
 
+
 def _sorted_function(args):
     return _create_builtin(args, get_list)
 
+
 def _super_function(args):
     passed_class, passed_self = args.get_arguments(['type', 'self'])
     if passed_self is None:
@@ -709,6 +720,7 @@ def _super_function(args):
                 return pyobjects.PyObject(supers[0])
         return passed_self
 
+
 def _zip_function(args):
     args = args.get_pynames(['sequence'])
     objects = []
@@ -721,6 +733,7 @@ def _zip_function(args):
     tuple = get_tuple(*objects)
     return get_list(tuple)
 
+
 def _enumerate_function(args):
     passed = args.get_pynames(['sequence'])[0]
     if passed is None:
@@ -730,6 +743,7 @@ def _enumerate_function(args):
     tuple = get_tuple(None, holding)
     return get_iterator(tuple)
 
+
 def _iter_function(args):
     passed = args.get_pynames(['sequence'])[0]
     if passed is None:
@@ -738,6 +752,7 @@ def _iter_function(args):
         holding = _infer_sequence_for_pyname(passed)
     return get_iterator(holding)
 
+
 def _input_function(args):
     return get_str()
 
@@ -751,17 +766,25 @@ def _input_function(args):
     'file': BuiltinName(get_file_type()),
     'open': BuiltinName(get_file_type()),
     'unicode': BuiltinName(get_str_type()),
-    'range': BuiltinName(BuiltinFunction(function=_range_function, builtin=range)),
-    'reversed': BuiltinName(BuiltinFunction(function=_reversed_function, builtin=reversed)),
-    'sorted': BuiltinName(BuiltinFunction(function=_sorted_function, builtin=sorted)),
-    'super': BuiltinName(BuiltinFunction(function=_super_function, builtin=super)),
-    'property': BuiltinName(BuiltinFunction(function=_property_function, builtin=property)),
+    'range': BuiltinName(BuiltinFunction(function=_range_function,
+                         builtin=range)),
+    'reversed': BuiltinName(BuiltinFunction(function=_reversed_function,
+                            builtin=reversed)),
+    'sorted': BuiltinName(BuiltinFunction(function=_sorted_function,
+                          builtin=sorted)),
+    'super': BuiltinName(BuiltinFunction(function=_super_function,
+                         builtin=super)),
+    'property': BuiltinName(BuiltinFunction(function=_property_function,
+                            builtin=property)),
     'zip': BuiltinName(BuiltinFunction(function=_zip_function, builtin=zip)),
-    'enumerate': BuiltinName(BuiltinFunction(function=_enumerate_function, builtin=enumerate)),
+    'enumerate': BuiltinName(BuiltinFunction(function=_enumerate_function,
+                             builtin=enumerate)),
     'object': BuiltinName(BuiltinObject()),
     'type': BuiltinName(BuiltinType()),
-    'iter': BuiltinName(BuiltinFunction(function=_iter_function, builtin=iter)),
-    'raw_input': BuiltinName(BuiltinFunction(function=_input_function, builtin=raw_input)),
-    }
+    'iter': BuiltinName(BuiltinFunction(function=_iter_function,
+                        builtin=iter)),
+    'raw_input': BuiltinName(BuiltinFunction(function=_input_function,
+                             builtin=raw_input)),
+}
 
 builtins = BuiltinModule('__builtin__', initial=_initial_builtins)