Skip to content

Commit 7235933

Browse files
klenklen
committed
Fix troubleshooting
1 parent 0346a03 commit 7235933

2 files changed

Lines changed: 37 additions & 54 deletions

File tree

‎autoload/pymode/troubleshooting.vim‎

Lines changed: 34 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ fun! pymode#troubleshooting#test() "{{{
1010
let os = substitute(system('uname'), "\n", "", "")
1111
endif
1212

13+
if !pymode#default('g:pymode_init', 1)
14+
call pymode#init(expand('<sfile>:p:h'), g:pymode_paths)
15+
call pymode#virtualenv#init()
16+
call pymode#breakpoint#init()
17+
endif
18+
1319
call append('0', ['Pymode diagnostic',
1420
\ '===================',
1521
\ 'VIM:' . v:version . ', OS: ' . os .', multi_byte:' . has('multi_byte') . ', pymode: ' . g:pymode_version . ', python: ' . g:pymode_python,
@@ -34,10 +40,10 @@ fun! pymode#troubleshooting#test() "{{{
3440

3541
else
3642

37-
call append('$', '')
3843
call append('$', 'VIM python paths:')
3944
call append('$', '-----------------')
4045
PymodePython << EOF
46+
import vim
4147
vim.command('let l:output = %s' % repr(sys.path))
4248
EOF
4349
call append('$', output)
@@ -48,58 +54,32 @@ EOF
4854
call append('$', 'Pymode variables:')
4955
call append('$', '-------------------')
5056
call append('$', 'let pymode = ' . string(g:pymode))
51-
52-
if g:pymode
53-
call append('$', 'let pymode_path = ' . string(g:pymode_path))
54-
if g:pymode_path
55-
call append('$', 'let pymode_paths = ' . string(g:pymode_paths))
56-
end
57-
58-
call append('$', 'let pymode_run = ' . string(g:pymode_run))
59-
if g:pymode_run
60-
call append('$', 'let pymode_run_bind = ' . string(g:pymode_run_bind))
61-
endif
62-
63-
call append('$', 'let pymode_folding = ' . string(g:pymode_folding))
64-
call append('$', 'let pymode_breakpoint = ' . string(g:pymode_breakpoint))
65-
call append('$', 'let pymode_syntax = ' . string(g:pymode_syntax))
66-
call append('$', 'let pymode_virtualenv = ' . string(g:pymode_virtualenv))
67-
call append('$', 'let pymode_trim_whitespaces = ' . string(g:pymode_trim_whitespaces))
68-
call append('$', 'let pymode_options = ' . string(g:pymode_options))
69-
70-
" call append('$', 'let pymode_doc = ' . string(g:pymode_doc))
71-
" if g:pymode_doc
72-
" call append('$', 'let pymode_doc_key = ' . string(g:pymode_doc_key))
73-
" endif
74-
75-
" call append('$', 'let pymode_lint = ' . string(g:pymode_lint))
76-
" if g:pymode_lint
77-
" call append('$', 'let pymode_lint_checker = ' . string(g:pymode_lint_checker))
78-
" call append('$', 'let pymode_lint_ignore = ' . string(g:pymode_lint_ignore))
79-
" call append('$', 'let pymode_lint_select = ' . string(g:pymode_lint_select))
80-
" call append('$', 'let pymode_lint_onfly = ' . string(g:pymode_lint_onfly))
81-
" call append('$', 'let pymode_lint_config = ' . string(g:pymode_lint_config))
82-
" call append('$', 'let pymode_lint_write = ' . string(g:pymode_lint_write))
83-
" call append('$', 'let pymode_lint_cwindow = ' . string(g:pymode_lint_cwindow))
84-
" call append('$', 'let pymode_lint_message = ' . string(g:pymode_lint_message))
85-
" call append('$', 'let pymode_lint_signs = ' . string(g:pymode_lint_signs))
86-
" call append('$', 'let pymode_lint_todo_symbol = ' . string(g:pymode_lint_todo_symbol))
87-
" call append('$', 'let pymode_lint_comment_symbol = ' . string(g:pymode_lint_comment_symbol))
88-
" call append('$', 'let pymode_lint_visual_symbol = ' . string(g:pymode_lint_visual_symbol))
89-
" call append('$', 'let pymode_lint_error_symbol = ' . string(g:pymode_lint_error_symbol))
90-
" call append('$', 'let pymode_lint_info_symbol = ' . string(g:pymode_lint_info_symbol))
91-
" call append('$', 'let pymode_lint_pyflakes_symbol = ' . string(g:pymode_lint_pyflakes_symbol))
92-
" call append('$', 'let pymode_lint_hold = ' . string(g:pymode_lint_hold))
93-
" endif
94-
95-
" call append('$', 'let pymode_rope = ' . string(g:pymode_rope))
96-
" if g:pymode_rope
97-
" call append('$', 'let pymode_rope_autocomplete_map = ' . string(g:pymode_rope_autocomplete_map))
98-
" call append('$', 'let pymode_rope_auto_project = ' . string(g:pymode_rope_auto_project))
99-
" call append('$', 'let pymode_rope_auto_project_open = ' . string(g:pymode_rope_auto_project_open))
100-
" end
101-
" endif
102-
103-
endif
57+
call append('$', 'let pymode_breakpoint = ' . string(g:pymode_breakpoint))
58+
call append('$', 'let pymode_breakpoint_bind = ' . string(g:pymode_breakpoint_bind))
59+
call append('$', 'let pymode_doc = ' . string(g:pymode_doc))
60+
call append('$', 'let pymode_doc_bind = ' . string(g:pymode_doc_bind))
61+
call append('$', 'let pymode_folding = ' . string(g:pymode_folding))
62+
call append('$', 'let pymode_indent = ' . string(g:pymode_indent))
63+
call append('$', 'let pymode_lint = ' . string(g:pymode_lint))
64+
call append('$', 'let pymode_lint_checkers = ' . string(g:pymode_lint_checkers))
65+
call append('$', 'let pymode_lint_cwindow = ' . string(g:pymode_lint_cwindow))
66+
call append('$', 'let pymode_lint_ignore = ' . string(g:pymode_lint_ignore))
67+
call append('$', 'let pymode_lint_message = ' . string(g:pymode_lint_message))
68+
call append('$', 'let pymode_lint_on_fly = ' . string(g:pymode_lint_on_fly))
69+
call append('$', 'let pymode_lint_on_write = ' . string(g:pymode_lint_on_write))
70+
call append('$', 'let pymode_lint_select = ' . string(g:pymode_lint_select))
71+
call append('$', 'let pymode_lint_signs = ' . string(g:pymode_lint_signs))
72+
call append('$', 'let pymode_motion = ' . string(g:pymode_motion))
73+
call append('$', 'let pymode_options = ' . string(g:pymode_options))
74+
call append('$', 'let pymode_paths = ' . string(g:pymode_paths))
75+
call append('$', 'let pymode_quickfix_maxheight = ' . string(g:pymode_quickfix_maxheight))
76+
call append('$', 'let pymode_quickfix_minheight = ' . string(g:pymode_quickfix_minheight))
77+
call append('$', 'let pymode_rope = ' . string(g:pymode_rope))
78+
call append('$', 'let pymode_run = ' . string(g:pymode_run))
79+
call append('$', 'let pymode_run_bind = ' . string(g:pymode_run_bind))
80+
call append('$', 'let pymode_trim_whitespaces = ' . string(g:pymode_trim_whitespaces))
81+
call append('$', 'let pymode_virtualenv = ' . string(g:pymode_virtualenv))
82+
call append('$', 'let pymode_virtualenv_enabled = ' . string(g:pymode_virtualenv_enabled))
83+
call append('$', 'let pymode_virtualenv_path = ' . string(g:pymode_virtualenv_path))
10484

10585
endfunction "}}}

‎doc/pymode.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@ You could choose prefer version, but value will be testsed on loading.
131131
Values are `python`, `python3`, `disable`. If value set to `disable` most
132132
python-features of **pymode** will be disabled.
133133

134+
Set value to `python3` if you are working with python3 projects. You could use
135+
|exrc|
136+
134137
------------------------------------------------------------------------------
135138
2.2 Python indentation ~
136139
*pymode-indent*

0 commit comments

Comments
 (0)