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

Author: klen

autoload/pymode/troubleshooting.vim

@@ -71,7 +71,6 @@ fun! pymode#troubleshooting#Test() "{{{
             call append('$', 'let pymode_rope_autocomplete_map = ' . string(g:pymode_rope_autocomplete_map))
             call append('$', 'let pymode_rope_auto_project = ' . string(g:pymode_rope_auto_project))
             call append('$', 'let pymode_rope_auto_project_open = ' . string(g:pymode_rope_auto_project_open))
-            call append('$', 'let pymode_rope_auto_session_manage = ' . string(g:pymode_rope_auto_session_manage))
         end
         call append('$', 'let pymode_folding = ' . string(g:pymode_folding))
         call append('$', 'let pymode_breakpoint = ' . string(g:pymode_breakpoint))

ftplugin/python/init-pymode.vim

@@ -206,9 +206,6 @@ if !pymode#Default("g:pymode_rope", 1) || g:pymode_rope
     " `.ropeproject` subdirectory.
     call pymode#Default("g:pymode_rope_auto_project_open", 1)
 
-    " OPTION: g:pymode_rope_auto_session_manage -- bool
-    call pymode#Default("g:pymode_rope_auto_session_manage", 0)
-
     " OPTION: g:pymode_rope_enable_autoimport -- bool. Enable autoimport
     call pymode#Default("g:pymode_rope_enable_autoimport", 1)
 
@@ -318,11 +315,6 @@ if !pymode#Default("g:pymode_rope", 1) || g:pymode_rope
         call RopeOpenExistingProject()
     endif
 
-     if !pymode#Default("g:pymode_rope_auto_session_manage", 0) || g:pymode_rope_auto_session_manage
-        autocmd VimLeave * call RopeSaveSession()
-        autocmd VimEnter * call RopeRestoreSession()
-     endif
-
 endif
 
 " }}}