Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitaf70229

Browse files
committed
Merge branch 'release/0.8.0'
2 parents626a3a9 +557057e commitaf70229

File tree

116 files changed

+6941
-3902
lines changed

Some content is hidden

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

116 files changed

+6941
-3902
lines changed

‎AUTHORS‎

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,39 @@ Maintainer:
55

66
Contributors:
77

8-
* Alvin Francis (alvinfrancis);
9-
* Anler Hp (ikame);
10-
* Anton Parkhomenko (chuwy);
11-
* Ashley Hewson (ashleyh);
12-
* Benjamin Ruston (bruston);
13-
* Boris Filippov (frenzykryger);
14-
* Daniel Hahler (blueyed)
15-
* David Vogt (winged);
16-
* Denis Kasak (dkasak);
17-
* Dirk Wallenstein (dirkwallenstein);
18-
* Florent Xicluna (florentx);
19-
* Fredrik Henrysson (fhenrysson);
20-
* Igor Guerrero (igorgue);
21-
* Jonathan McCall (Jonnymcc);
22-
* Kevin Deldycke (kdeldycke);
23-
* Lowe Thiderman (thiderman);
24-
* Martin Brochhaus (mbrochh);
25-
* Matthew Moses (mlmoses);
26-
* Mel Boyce (syngin)
27-
* Mohammed (mbadran);
28-
* Naoya Inada (naoina);
29-
* Pedro Algarvio (s0undt3ch);
30-
* Phillip Cloud (cpcloud);
31-
* Piet Delport (pjdelport);
32-
* Robert David Grant (bgrant);
33-
* Ronald Andreu Kaiser (cathoderay);
8+
* Alvin Francis (http://github.com/alvinfrancis);
9+
* Anler Hp (http://github.com/ikame);
10+
* Anton Parkhomenko (http://github.com/chuwy);
11+
* Ashley Hewson (http://github.com/ashleyh);
12+
* Benjamin Ruston (http://github.com/bruston);
13+
* Boris Filippov (http://github.com/frenzykryger);
14+
* Brad Mease (http://github.com/bmease)
15+
* Daniel Hahler (http://github.com/blueyed)
16+
* David Vogt (http://github.com/winged);
17+
* Denis Kasak (http://github.com/dkasak);
18+
* Dirk Wallenstein (http://github.com/dirkwallenstein);
19+
* Florent Xicluna (http://github.com/florentx);
20+
* Fredrik Henrysson (http://github.com/fhenrysson);
21+
* Igor Guerrero (http://github.com/igorgue);
22+
* Jason Harvey (http://github.com/alienth)
23+
* Jay Rainey (https://github.com/jawrainey)
24+
* Jonathan McCall (http://github.com/Jonnymcc);
25+
* Kevin Deldycke (http://github.com/kdeldycke);
26+
* Lowe Thiderman (http://github.com/thiderman);
27+
* Martin Brochhaus (http://github.com/mbrochh);
28+
* Matthew Moses (http://github.com/mlmoses);
29+
* Mel Boyce (http://github.com/syngin)
30+
* Mohammed (http://github.com/mbadran);
31+
* Naoya Inada (http://github.com/naoina);
32+
* Pedro Algarvio (http://github.com/s0undt3ch);
33+
* Phillip Cloud (http://github.com/cpcloud);
34+
* Piet Delport (http://github.com/pjdelport);
35+
* Robert David Grant (http://github.com/bgrant);
36+
* Ronald Andreu Kaiser (http://github.com/cathoderay);
3437
* Sorin Ionescu (sorin-ionescu);
35-
* Steve Losh (sjl);
38+
* Steve Losh (http://github.com/sjl);
39+
* bendavis78 (http://github.com/bendavis78)
40+
* fwuzju (http://github.com/fwuzju)
3641
* lawrenceakka;
3742
* lee (loyalpartner);
3843
* nixon;

‎Changelog.rst‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
Changelog
22
=========
33

4+
## 2013-12-04 0.8.0
5+
-------------------
6+
* Pylama updated to version 3.3.2
7+
* Get fold's expression symbol from &fillchars;
8+
* Fixed error when setting g:pymode_breakpoint_cmd (expobrain);
9+
* Fixed code running;
10+
* Ability to override rope project root and .ropeproject folder
11+
* Added path argument to `PymodeRopeNewProject` which skips prompt
12+
* Disable `pymode_rope_lookup_project` by default
13+
* Options added:
14+
'pymode_rope_project_root', 'pymode_rope_ropefolder'
15+
16+
417
## 2013-12-04 0.7.8b
518
--------------------
619
* Update indentation support;

‎Makefile‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@ clean:
1313
travis:
1414
raketest
1515

16-
.PHONY: test
16+
.PHONY: test t
1717
test:
1818
bundle install
1919
rm -rf$(CURDIR)/.ropeproject
2020
raketest
21+
t: test
2122

2223
.PHONY: pylama
2324
pylama:
@@ -37,14 +38,11 @@ $(CURDIR)/build:
3738
cp -r after autoload doc ftplugin plugin pymode syntax$(CURDIR)/build/usr/share/vim/addons/.
3839
cp -r python-mode.yaml$(CURDIR)/build/usr/share/vim/registry/.
3940

40-
TARGET?=$(CURDIR)/deb
4141
PACKAGE_VERSION?=$(shell git describe --tags `git rev-list master --tags --max-count=1`)
4242
PACKAGE_NAME="vim-python-mode"
4343
PACKAGE_MAINTAINER="Kirill Klenov <horneds@gmail.com>"
4444
PACKAGE_URL=http://github.com/klen/python-mode
4545
deb: clean$(CURDIR)/build
46-
@git co gh-pages
47-
@rm -rf deb
4846
@fpm -s dir -t deb -a all\
4947
-n$(PACKAGE_NAME)\
5048
-v$(PACKAGE_VERSION)\
@@ -58,10 +56,4 @@ deb: clean $(CURDIR)/build
5856
-d"python2.7"\
5957
-d"vim-addon-manager"\
6058
usr
61-
@mkdir -p$(TARGET)
62-
@prm --type deb --path$(TARGET)\
63-
--release precise,quantal,raring,saucy\
64-
--arch amd64,i386,all\
65-
--component main\
66-
--directory$(CURDIR)\
67-
--gpg horneds@gmail.com
59+
@mv*.deb~/Dropbox/projects/deb/load

‎README.rst‎

Lines changed: 11 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ by utilizing libraries including pylint_, rope_, pydoc_, pyflakes_, pep8_, and
1313
mccabe_ for features like static analysis, refactoring, folding, completion,
1414
documentation, and more.
1515

16-
The plugincontaints all you need to develop python applications in Vim.
16+
The plugincontains all you need to develop python applications in Vim.
1717

1818
There is no need to installpylint_,rope_ or any other Python libraries on
1919
your system.
@@ -167,111 +167,6 @@ Copyright
167167

168168
Copyright © 2013 Kirill Klenov (klen_)
169169

170-
Rope
171-
-----
172-
Copyright (C) 2006-2010 Ali Gholami Rudi
173-
174-
Copyright (C) 2009-2010 Anton Gritsay
175-
176-
https://pypi.python.org/pypi/rope
177-
178-
https://pypi.python.org/pypi/ropemode
179-
180-
http://rope.sourceforge.net/ropevim.html
181-
182-
183-
Pylama
184-
------
185-
Copyright (C) 2012-2013 Kirill Klenov
186-
187-
https://pypi.python.org/pypi/pylama
188-
189-
https://github.com/klen/pylama
190-
191-
192-
Pylint
193-
------
194-
Copyright (C) 2003-2011 LOGILAB S.A. (Paris, FRANCE).
195-
196-
https://pypi.python.org/pypi/pylint
197-
198-
https://bitbucket.org/logilab/pylint
199-
200-
http://www.pylint.org/
201-
202-
http://www.logilab.fr/
203-
204-
205-
Pyflakes
206-
--------
207-
208-
Copyright (c) 2005 Divmod, Inc.
209-
210-
https://pypi.python.org/pypi/pyflakes
211-
212-
https://launchpad.net/pyflakes
213-
214-
http://www.divmod.com/
215-
216-
217-
pep8
218-
----
219-
Copyright (C) 2006 Johann C. Rocholl <johann@rocholl.net>
220-
221-
https://pypi.python.org/pypi/pep8
222-
223-
http://github.com/jcrocholl/pep8
224-
225-
http://www.python.org/dev/peps/pep-0008/
226-
227-
228-
autopep8
229-
--------
230-
Copyright (C) 2010-2011 Hideo Hattori <hhatto.jp@gmail.com
231-
232-
Copyright (C) 2011-2013 Hideo Hattori, Steven Myint
233-
234-
https://pypi.python.org/pypi/autopep8
235-
236-
https://github.com/hhatto/autopep8
237-
238-
239-
pep257
240-
-------
241-
Copyright (C) 2012 Vladimir Keleshev, GreenSteam A/S
242-
243-
https://pypi.python.org/pypi/pep257
244-
245-
http://github.com/GreenSteam/pep257
246-
247-
http://www.python.org/dev/peps/pep-0257/
248-
249-
250-
mccabe
251-
------
252-
Copyright (C) 2008 Ned Batchelder
253-
254-
Copyright (C) 2013 Florent Xicluna
255-
256-
https://pypi.python.org/pypi/mccabe
257-
258-
https://github.com/flintwork/mccabe
259-
260-
261-
Python syntax for vim
262-
----------------------
263-
Copyright (c) 2010 Dmitry Vasiliev
264-
265-
http://www.hlabs.spb.ru/vim/python.vim
266-
267-
268-
PEP8 VIM indentation
269-
---------------------
270-
Copyright (c) 2012 Hynek Schlawack <hs@ox.cx>
271-
272-
http://github.com/hynek/vim-python-pep8-indent
273-
274-
275170
License
276171
=======
277172

@@ -281,12 +176,18 @@ If you like this plugin, you can send me postcard :)
281176
My address is here: "Russia, 143401, Krasnogorsk, Shkolnaya 1-19" to "Kirill Klenov".
282177
**Thanks for support!**
283178

284-
285179
.. _GNU lesser general public license:http://www.gnu.org/copyleft/lesser.html
286180
.. _klen:http://klen.github.com/
287181
.. _pydoc:http://docs.python.org/library/pydoc.html
288182
.. _pathogen:https://github.com/tpope/vim-pathogen
289-
.. _mccabe:http://en.wikipedia.org/wiki/Cyclomatic_complexity
290-
.. _Rope:http://rope.sourceforge.net/
291-
.. _Pylama:https://github.com/klen/pylama
183+
.. _rope:https://pypi.python.org/pypi/rope
184+
.. _pylama:https://github.com/klen/pylama
185+
.. _pylint:https://bitbucket.org/logilab/pylint
186+
.. _pyflakes:https://pypi.python.org/pypi/pyflakes
187+
.. _autopep8:https://github.com/hhatto/autopep8
188+
.. _pep257:http://github.com/GreenSteam/pep257
189+
.. _mccabe:https://github.com/flintwork/mccabe
190+
.. _pythonvim:http://www.hlabs.spb.ru/vim/python.vim
191+
.. _pep8:http://github.com/jcrocholl/pep8
192+
.. _pep8indent:http://github.com/hynek/vim-python-pep8-indent
292193
.. |logo|image::https://raw.github.com/klen/python-mode/develop/logo.png

‎after/ftplugin/python.vim‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,36 @@ if g:pymode_motion
1111
finish
1212
endif
1313

14-
nnoremap<buffer>]]:<C-U>call pymode#motion#move('^\(class\\|def\)\s', '')<CR>
15-
nnoremap<buffer>[[:<C-U>call pymode#motion#move('^\(class\\|def\)\s', 'b')<CR>
16-
nnoremap<buffer>]C:<C-U>call pymode#motion#move('^\(class\\|def\)\s', '')<CR>
17-
nnoremap<buffer>[C:<C-U>call pymode#motion#move('^\(class\\|def\)\s', 'b')<CR>
18-
nnoremap<buffer>]M:<C-U>call pymode#motion#move('^\s*def\s', '')<CR>
19-
nnoremap<buffer>[M:<C-U>call pymode#motion#move('^\s*def\s', 'b')<CR>
20-
21-
onoremap<buffer>]]:<C-U>call pymode#motion#move('^\(class\\|def\)\s', '')<CR>
22-
onoremap<buffer>[[:<C-U>call pymode#motion#move('^\(class\\|def\)\s', 'b')<CR>
23-
onoremap<buffer>]C:<C-U>call pymode#motion#move('^\(class\\|def\)\s', '')<CR>
24-
onoremap<buffer>[C:<C-U>call pymode#motion#move('^\(class\\|def\)\s', 'b')<CR>
25-
onoremap<buffer>]M:<C-U>call pymode#motion#move('^\s*def\s', '')<CR>
26-
onoremap<buffer>[M:<C-U>call pymode#motion#move('^\s*def\s', 'b')<CR>
27-
28-
vnoremap<buffer>]]:call pymode#motion#vmove('^\(class\\|def\)\s', '')<CR>
29-
vnoremap<buffer>[[:call pymode#motion#vmove('^\(class\\|def\)\s', 'b')<CR>
30-
vnoremap<buffer>]M:call pymode#motion#vmove('^\s*def\s', '')<CR>
31-
vnoremap<buffer>[M:call pymode#motion#vmove('^\s*def\s', 'b')<CR>
32-
33-
onoremap<buffer>C:<C-U>call pymode#motion#select('^\s*class\s', 0)<CR>
34-
onoremap<buffer>aC:<C-U>call pymode#motion#select('^\s*class\s', 0)<CR>
35-
onoremap<buffer>iC:<C-U>call pymode#motion#select('^\s*class\s', 1)<CR>
36-
vnoremap<buffer>aC:<C-U>call pymode#motion#select('^\s*class\s', 0)<CR>
37-
vnoremap<buffer>iC:<C-U>call pymode#motion#select('^\s*class\s', 1)<CR>
38-
39-
onoremap<buffer>M:<C-U>call pymode#motion#select('^\s*def\s', 0)<CR>
40-
onoremap<buffer>aM:<C-U>call pymode#motion#select('^\s*def\s', 0)<CR>
41-
onoremap<buffer>iM:<C-U>call pymode#motion#select('^\s*def\s', 1)<CR>
42-
vnoremap<buffer>aM:<C-U>call pymode#motion#select('^\s*def\s', 0)<CR>
43-
vnoremap<buffer>iM:<C-U>call pymode#motion#select('^\s*def\s', 1)<CR>
14+
nnoremap<buffer>]]:<C-U>call pymode#motion#move('<Bslash>v^(class<bar>def)<Bslash>s', '')<CR>
15+
nnoremap<buffer>[[:<C-U>call pymode#motion#move('<Bslash>v^(class<bar>def)<Bslash>s', 'b')<CR>
16+
nnoremap<buffer>]C:<C-U>call pymode#motion#move('<Bslash>v^(class<bar>def)<Bslash>s', '')<CR>
17+
nnoremap<buffer>[C:<C-U>call pymode#motion#move('<Bslash>v^(class<bar>def)<Bslash>s', 'b')<CR>
18+
nnoremap<buffer>]M:<C-U>call pymode#motion#move('^<Bslash>s*def<Bslash>s', '')<CR>
19+
nnoremap<buffer>[M:<C-U>call pymode#motion#move('^<Bslash>s*def<Bslash>s', 'b')<CR>
20+
21+
onoremap<buffer>]]:<C-U>call pymode#motion#move('<Bslash>v^(class<bar>def)<Bslash>s', '')<CR>
22+
onoremap<buffer>[[:<C-U>call pymode#motion#move('<Bslash>v^(class<bar>def)<Bslash>s', 'b')<CR>
23+
onoremap<buffer>]C:<C-U>call pymode#motion#move('<Bslash>v^(class<bar>def)<Bslash>s', '')<CR>
24+
onoremap<buffer>[C:<C-U>call pymode#motion#move('<Bslash>v^(class<bar>def)<Bslash>s', 'b')<CR>
25+
onoremap<buffer>]M:<C-U>call pymode#motion#move('^<Bslash>s*def<Bslash>s', '')<CR>
26+
onoremap<buffer>[M:<C-U>call pymode#motion#move('^<Bslash>s*def<Bslash>s', 'b')<CR>
27+
28+
vnoremap<buffer>]]:call pymode#motion#vmove('<Bslash>v^(class<bar>def)<Bslash>s', '')<CR>
29+
vnoremap<buffer>[[:call pymode#motion#vmove('<Bslash>v^(class<bar>def)<Bslash>s', 'b')<CR>
30+
vnoremap<buffer>]M:call pymode#motion#vmove('^<Bslash>s*def<Bslash>s', '')<CR>
31+
vnoremap<buffer>[M:call pymode#motion#vmove('^<Bslash>s*def<Bslash>s', 'b')<CR>
32+
33+
onoremap<buffer>C:<C-U>call pymode#motion#select('^<Bslash>s*class<Bslash>s', 0)<CR>
34+
onoremap<buffer>aC:<C-U>call pymode#motion#select('^<Bslash>s*class<Bslash>s', 0)<CR>
35+
onoremap<buffer>iC:<C-U>call pymode#motion#select('^<Bslash>s*class<Bslash>s', 1)<CR>
36+
vnoremap<buffer>aC:<C-U>call pymode#motion#select('^<Bslash>s*class<Bslash>s', 0)<CR>
37+
vnoremap<buffer>iC:<C-U>call pymode#motion#select('^<Bslash>s*class<Bslash>s', 1)<CR>
38+
39+
onoremap<buffer>M:<C-U>call pymode#motion#select('^<Bslash>s*def<Bslash>s', 0)<CR>
40+
onoremap<buffer>aM:<C-U>call pymode#motion#select('^<Bslash>s*def<Bslash>s', 0)<CR>
41+
onoremap<buffer>iM:<C-U>call pymode#motion#select('^<Bslash>s*def<Bslash>s', 1)<CR>
42+
vnoremap<buffer>aM:<C-U>call pymode#motion#select('^<Bslash>s*def<Bslash>s', 0)<CR>
43+
vnoremap<buffer>iM:<C-U>call pymode#motion#select('^<Bslash>s*def<Bslash>s', 1)<CR>
4444
4545
endif
4646

‎autoload/pymode.vim‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,9 @@ fun! pymode#debug(msg) "{{{
130130
echomstring(g:pymode_debug) .':' .string(a:msg)
131131
endif
132132
endfunction"}}}
133+
134+
fun!pymode#quit()"{{{
135+
augrouppymode
136+
au!
137+
augroupEND
138+
endfunction"}}}

‎autoload/pymode/breakpoint.vim‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ fun! pymode#breakpoint#init() "{{{
1111
return
1212
endif
1313

14+
endif
15+
1416
PymodePython << EOF
1517

1618
fromimpimport find_module
@@ -25,8 +27,6 @@ for module in ('pudb', 'ipdb'):
2527

2628
EOF
2729

28-
endif
29-
3030
endfunction"}}}
3131

3232
fun!pymode#breakpoint#operate(lnum)"{{{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp