Visitar URL original
Merge branch 'develop' of https://github.com/klen/python-mode into de… · python-mode/python-mode@1264c43 · GitHub
Skip to content

Commit 1264c43

Browse files
dannywillemsdannywillems
committed
Merge branch 'develop' of https://github.com/klen/python-mode into develop
2 parents fdef905 + e92df45 commit 1264c43

72 files changed

Lines changed: 1383 additions & 863 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎AUTHORS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Contributors:
1616
* Daniel Hahler (http://github.com/blueyed)
1717
* David Vogt (http://github.com/winged);
1818
* Denis Kasak (http://github.com/dkasak);
19+
* Dimitrios Semitsoglou-Tsiapos (https://github.com/dset0x)
1920
* Dirk Wallenstein (http://github.com/dirkwallenstein);
2021
* Florent Xicluna (http://github.com/florentx);
2122
* Fredrik Henrysson (http://github.com/fhenrysson);
@@ -40,6 +41,7 @@ Contributors:
4041
* Sorin Ionescu (sorin-ionescu);
4142
* Steve Losh (http://github.com/sjl);
4243
* Tommy Allen (https://github.com/tweekmonster)
44+
* Tyler Fenby (https://github.com/TFenby)
4345
* Wayne Ye (https://github.com/WayneYe)
4446
* bendavis78 (http://github.com/bendavis78)
4547
* fwuzju (http://github.com/fwuzju)

‎Changelog.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ Changelog
22
=========
33

44
* Pylama updated to version 5.0.5
5+
* Rope libs updated
56
* Add 'pymode_options_max_line_length' option
67
* Add ability to set related checker options `:help pymode-lint-options`
78
Options added: 'pymode_lint_options_pep8', 'pymode_lint_options_pep257',
89
'pymode_lint_options_mccabe', 'pymode_lint_options_pyflakes',
910
'pymode_lint_options_pylint'
1011

12+
1113
## 2014-06-11 0.8.1
1214
-------------------
1315
* Pylama updated to version 3.3.2

‎Makefile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ pylama:
2626
make $(PYLAMA)
2727
make $(PYLAMA)/lint/pylama_pylint
2828

29+
.PHONY: rope
30+
rope:
31+
@git clone https://github.com/python-rope/rope.git $(CURDIR)/_/rope
32+
@rm -rf $(CURDIR)/pymode/libs/rope
33+
@cp -r $(CURDIR)/_/rope/rope $(CURDIR)/pymode/libs/.
34+
2935
$(PYLAMA):
3036
cp -r ~/Dropbox/projects/pylama/pylama $(PYLAMA)
3137

‎README.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ License
187187

188188
Licensed under a `GNU lesser general public license`_.
189189

190-
If you like this plugin, you can send me postcard :)
191-
My address is here: "Russia, 143401, Krasnogorsk, Shkolnaya 1-19" to "Kirill Klenov".
190+
If you like this plugin, I would very appreciated if you kindly send me a postcard :)
191+
My address is here: "Russia, 143500, MO, Istra, pos. Severny 8-3" to "Kirill Klenov".
192192
**Thanks for support!**
193193

194194
.. _GNU lesser general public license: http://www.gnu.org/copyleft/lesser.html

‎autoload/pymode/folding.vim‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fun! pymode#folding#text() " {{{
1818
while getline(fs) !~ s:def_regex && getline(fs) !~ s:doc_begin_regex
1919
let fs = nextnonblank(fs + 1)
2020
endwhile
21-
if getline(fs) =~ s:doc_begin_regex
21+
if getline(fs) =~ s:doc_end_regex && getline(fs) =~ s:doc_begin_regex
2222
let fs = nextnonblank(fs + 1)
2323
endif
2424
let line = getline(fs)

‎doc/pymode.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ Keymap for autocomplete *'g:pymode_rope_completion_bind'*
482482
Extended autocompletion (rope could complete objects which have not been
483483
imported) from project *'g:pymode_rope_autoimport'*
484484
>
485-
let g:pymode_rope_autoimport = 1
485+
let g:pymode_rope_autoimport = 0
486486
487487
Load modules to autoimport by default *'g:pymode_rope_autoimport_modules'*
488488
>
@@ -781,10 +781,10 @@ The sequence of commands that fixed this:
781781
Python-mode is released under the GNU lesser general public license.
782782
See: http://www.gnu.org/copyleft/lesser.html
783783

784-
If you like this plugin, you can send me a postcard :)
784+
If you like this plugin, I would very appreciated if you kindly send me a postcard :)
785785

786-
My address is: "Russia, 143401, Krasnogorsk, Shkolnaya 1-19" to "Kirill
787-
Klenov". Thanks for your support!
786+
My address is: "Russia, 143500, MO, Istra, pos. Severny 8-3" to "Kirill Klenov".
787+
Thanks for your support!
788788

789789

790790
------------------------------------------------------------------------------

‎plugin/pymode.vim‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ call pymode#default('g:pymode_rope_completion', 1)
183183

184184
" Complete keywords from not imported modules (could make completion slower)
185185
" Enable autoimport used modules
186-
call pymode#default('g:pymode_rope_autoimport', 1)
186+
call pymode#default('g:pymode_rope_autoimport', 0)
187187

188188
" Offer to import object after complete (if that not be imported before)
189189
call pymode#default('g:pymode_rope_autoimport_import_after_complete', 0)

‎pylama.ini‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1-
[main]
2-
ignore = R0201,R0922,E1103
3-
skip = pymode/autopep8.py
1+
[pylama]
2+
linters=pep8,pyflakes,pylint
3+
4+
[pylama:pymode/libs*]
5+
skip=1
6+
7+
[pylama:pylint]
8+
disable=E1120,E1130,E1103,W1401

‎pymode/libs2/rope/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""rope, a python refactoring library"""
22

33
INFO = __doc__
4-
VERSION = '0.9.4'
4+
VERSION = '0.10.2'
55
COPYRIGHT = """\
66
Copyright (C) 2006-2012 Ali Gholami Rudi
77
Copyright (C) 2009-2012 Anton Gritsay

‎pymode/libs2/rope/base/arguments.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ def get_pynames(self, parameters):
7272

7373
def get_instance_pyname(self):
7474
return self.pynames[0]
75+
76+
7577
class MixedArguments(object):
7678

7779
def __init__(self, pyname, arguments, scope):

0 commit comments

Comments
 (0)