Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e877c7e

Browse files
klenklen
committed
Merge branch 'release/0.6.9'
2 parents e4a72d7 + 9e7830f commit e877c7e

File tree

6 files changed

+113
-67
lines changed

6 files changed

+113
-67
lines changed

‎Changelog.rst‎

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

4+
## 2012-09-07 0.6.9
5+
-------------------
6+
* Update autopep8
7+
* Improve pymode#troubleshooting#Test()
8+
49
## 2012-09-06 0.6.8
510
-------------------
611
* Add PEP8 indentation ":help 'pymode_indent'"

‎README.rst‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,20 @@ Try use pyflakes_, see ``:h 'pymode_lint_checker'``.
433433
Example: On Flask projects I automaticly set ``g:pymode_lint_checker = "pyflakes"``, on django ``g:pymode_lint_cheker = "pylint"``
434434

435435

436+
OSX cannot import urandom
437+
-------------------------
438+
439+
See: https://groups.google.com/forum/?fromgroups=#!topic/vim_dev/2NXKF6kDONo
440+
441+
The sequence of commands that fixed this: ::
442+
443+
brew unlink python
444+
brew unlink macvim
445+
brew remove macvim
446+
brew install -v --force macvim
447+
brew link macvim
448+
brew link python
449+
436450

437451
Bugtracker
438452
===========

‎autoload/pymode/troubleshooting.vim‎

Lines changed: 51 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,17 @@
22
fun! pymode#troubleshooting#Test() "{{{
33
new
44
setlocal buftype=nofile bufhidden=delete noswapfile nowrap
5+
6+
let os = "Unknown"
7+
if has('win16') || has('win32') || has('win64')
8+
let os = "Windows"
9+
else
10+
let os = substitute(system('uname'), "\n", "", "")
11+
endif
12+
513
call append('0', ['Pymode diagnostic',
614
\ '===================',
7-
\ 'VIM:' . v:version . ' multi_byte:' . has('multi_byte') . ' pymode: ' . g:pymode_version,
15+
\ 'VIM:' . v:version . ', OS: ' . os .', multi_byte:' . has('multi_byte') . ', pymode: ' . g:pymode_version,
816
\ ''])
917

1018
let python = 1
@@ -22,26 +30,48 @@ fun! pymode#troubleshooting#Test() "{{{
2230

2331
call append('$', 'Pymode variables:')
2432
call append('$', '-------------------')
25-
call append('$', 'pymode:' . g:pymode)
26-
call append('$', 'pymode_lint:' . g:pymode_lint)
27-
call append('$', 'pymode_rope:' . g:pymode_rope)
28-
call append('$', 'pymode_path:' . g:pymode_path)
29-
call append('$', 'pymode_doc:' . g:pymode_doc)
30-
call append('$', 'pymode_run:' . g:pymode_run)
31-
call append('$', 'pymode_virtualenv:' . g:pymode_virtualenv)
32-
call append('$', 'pymode_breakpoint:' . g:pymode_breakpoint)
33-
call append('$', 'pymode_path:' . g:pymode_path)
34-
call append('$', 'pymode_folding:' . g:pymode_folding)
35-
call append('$', 'pymode_syntax:' . g:pymode_syntax)
36-
call append('$', 'pymode_utils_whitespaces:' . g:pymode_utils_whitespaces)
37-
call append('$', 'pymode_options_indent:' . g:pymode_options_indent)
38-
call append('$', 'pymode_options_other:' . g:pymode_options_other)
39-
40-
if len(g:pymode_virtualenv_enabled)
41-
call append('$', 'Enabled virtualenv:')
42-
call append('$', '-------------------')
43-
call append('$', g:pymode_virtualenv_enabled)
44-
call append('$', '')
33+
call append('$', 'let pymode = ' . string(g:pymode))
34+
if g:pymode
35+
call append('$', 'let pymode_path = ' . string(g:pymode_path))
36+
call append('$', 'let pymode_paths = ' . string(g:pymode_paths))
37+
38+
call append('$', 'let pymode_doc = ' . string(g:pymode_doc))
39+
if g:pymode_doc
40+
call append('$', 'let pymode_doc_key = ' . string(g:pymode_doc_key))
41+
endif
42+
43+
call append('$', 'let pymode_run = ' . string(g:pymode_run))
44+
if g:pymode_run
45+
call append('$', 'let pymode_run_key = ' . string(g:pymode_run_key))
46+
endif
47+
48+
call append('$', 'let pymode_lint = ' . string(g:pymode_lint))
49+
if g:pymode_lint
50+
call append('$', 'let pymode_lint_checker = ' . string(g:pymode_lint_checker))
51+
call append('$', 'let pymode_lint_ignore = ' . string(g:pymode_lint_ignore))
52+
call append('$', 'let pymode_lint_select = ' . string(g:pymode_lint_select))
53+
call append('$', 'let pymode_lint_onfly = ' . string(g:pymode_lint_onfly))
54+
call append('$', 'let pymode_lint_config = ' . string(g:pymode_lint_config))
55+
call append('$', 'let pymode_lint_write = ' . string(g:pymode_lint_write))
56+
call append('$', 'let pymode_lint_cwindow = ' . string(g:pymode_lint_cwindow))
57+
call append('$', 'let pymode_lint_message = ' . string(g:pymode_lint_message))
58+
call append('$', 'let pymode_lint_signs = ' . string(g:pymode_lint_signs))
59+
call append('$', 'let pymode_lint_jump = ' . string(g:pymode_lint_jump))
60+
call append('$', 'let pymode_lint_hold = ' . string(g:pymode_lint_hold))
61+
call append('$', 'let pymode_lint_minheight = ' . string(g:pymode_lint_minheight))
62+
call append('$', 'let pymode_lint_maxheight = ' . string(g:pymode_lint_maxheight))
63+
endif
64+
65+
call append('$', 'let pymode_rope = ' . string(g:pymode_rope))
66+
call append('$', 'let pymode_folding = ' . string(g:pymode_folding))
67+
call append('$', 'let pymode_breakpoint = ' . string(g:pymode_breakpoint))
68+
call append('$', 'let pymode_syntax = ' . string(g:pymode_syntax))
69+
call append('$', 'let pymode_virtualenv = ' . string(g:pymode_virtualenv))
70+
if g:pymode_virtualenv
71+
call append('$', 'let pymode_virtualenv_enabled = ' . string(g:pymode_virtualenv_enabled))
72+
endif
73+
call append('$', 'pymode_utils_whitespaces:' . string(g:pymode_utils_whitespaces))
74+
call append('$', 'pymode_options:' . string(g:pymode_options))
4575
endif
4676

4777
if python

‎doc/pymode.txt‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
(__) (__) (__) (_) (_)(_____)(_)\_) (_/\/\_)(_____)(____/(____) ~
77

88

9-
Version: 0.6.8
9+
Version: 0.6.9
1010

1111
==============================================================================
1212
CONTENTS *Python-mode-contents*
@@ -92,8 +92,6 @@ PythonMode. These options should be set in your vimrc.
9292

9393
|'pymode_breakpoint_key'| Key for breakpoint
9494

95-
|'pymode_utils'| Turns off utils
96-
9795
|'pymode_virtualenv'| Turns off virtualenv
9896

9997
|'pymode_utils_whitespaces'| Remove unused whitespaces
@@ -315,13 +313,6 @@ Default: '<leader>b'.
315313

316314
Key for setting/unsetting breakpoints.
317315

318-
------------------------------------------------------------------------------
319-
*'pymode_utils'*
320-
Values: 0 or 1.
321-
Default: 1.
322-
323-
If this option is set to 0 the then utils script is disabled.
324-
325316
------------------------------------------------------------------------------
326317
*'pymode_virtualenv'*
327318
Values: 0 or 1.
@@ -490,6 +481,20 @@ from `.vimrc` from your projects directories.
490481
On Django 'g:pymode_lint_checker = "pylint"'
491482
<
492483

484+
OSX cannot import urandom
485+
-------------------------
486+
487+
See: https://groups.google.com/forum/?fromgroups=#!topic/vim_dev/2NXKF6kDONo
488+
489+
The sequence of commands that fixed this:
490+
>
491+
brew unlink python
492+
brew unlink macvim
493+
brew remove macvim
494+
brew install -v --force macvim
495+
brew link macvim
496+
brew link python
497+
<
493498

494499
==============================================================================
495500
6. Credits ~

‎plugin/pymode.vim‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
let g:pymode_version = "0.6.8"
1+
let g:pymode_version = "0.6.9"
22

33
com! PymodeVersion echomsg "Current python-mode version: " . g:pymode_version
44

‎pylibs/autopep8.py‎

Lines changed: 27 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -362,23 +362,19 @@ def fix_e123(self, result, logical):
362362
"""The 'loose fingernails' indentation level error for hanging
363363
indents."""
364364
# fix by deleting whitespace to the correct level
365-
modified_lines = self._fix_reindent(result, logical)
366-
if modified_lines:
367-
return modified_lines
368-
else:
369-
# Fallback
370-
if not logical:
371-
return []
372-
logical_lines = logical[2]
373-
line_index = result['line'] - 1
374-
original_line = self.source[line_index]
365+
if not logical:
366+
return []
367+
logical_lines = logical[2]
368+
line_index = result['line'] - 1
369+
original_line = self.source[line_index]
375370

376-
fixed_line = (_get_indentation(logical_lines[0]) +
377-
original_line.lstrip())
378-
if fixed_line == original_line:
379-
return []
380-
else:
381-
self.source[line_index] = fixed_line
371+
fixed_line = (_get_indentation(logical_lines[0]) +
372+
original_line.lstrip())
373+
if fixed_line == original_line:
374+
# Fallback to slower method.
375+
return self._fix_reindent(result, logical)
376+
else:
377+
self.source[line_index] = fixed_line
382378

383379
def fix_e124(self, result, logical):
384380
"""The 'loose fingernails' indentation level error for visual
@@ -401,33 +397,29 @@ def fix_e125(self, result, logical):
401397
def fix_e126(self, result, logical):
402398
"""The 'spectacular indent' error for hanging indents."""
403399
# fix by deleting whitespace to the left
404-
modified_lines = self._fix_reindent(result, logical)
405-
if modified_lines:
406-
return modified_lines
407-
else:
408-
# Fallback
409-
if not logical:
410-
return []
411-
logical_lines = logical[2]
412-
line_index = result['line'] - 1
413-
original = self.source[line_index]
400+
if not logical:
401+
return []
402+
logical_lines = logical[2]
403+
line_index = result['line'] - 1
404+
original = self.source[line_index]
414405

415-
fixed = (_get_indentation(logical_lines[0]) +
416-
self.indent_word + original.lstrip())
417-
if fixed == original:
418-
return []
419-
else:
420-
self.source[line_index] = fixed
406+
fixed = (_get_indentation(logical_lines[0]) +
407+
self.indent_word + original.lstrip())
408+
if fixed == original:
409+
# Fallback to slower method.
410+
return self._fix_reindent(result, logical)
411+
else:
412+
self.source[line_index] = fixed
421413

422414
def fix_e127(self, result, logical):
423415
"""The 'interpretive dance' indentation error."""
424416
# Fix by inserting/deleting whitespace to the correct level.
425-
modified_lines = self._fix_reindent(result, logical)
417+
modified_lines = self._align_visual_indent(result, logical)
426418
if modified_lines:
427419
return modified_lines
428420
else:
429-
# Fallback
430-
return self._align_visual_indent(result, logical)
421+
# Fallback to slower method.
422+
return self._fix_reindent(result, logical)
431423

432424
def _align_visual_indent(self, result, logical):
433425
"""Correct visual indent.

0 commit comments

Comments
 (0)