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

klen · klen · commit f756847d4c4b · 2013-10-13T19:16:57.000+07:00
diff --git a/autoload/pymode/breakpoint.vim b/autoload/pymode/breakpoint.vim
@@ -23,6 +23,7 @@ for module in ('pudb', 'ipdb'):
     try:
         find_module(module)
         vim.command('let g:pymode_breakpoint_cmd = "import %s; %s.set_trace()  # XXX BREAKPOINT"' % (module, module))
+        break
     except ImportError:
         continue
 EOF
diff --git a/autoload/pymode/run.vim b/autoload/pymode/run.vim
@@ -113,6 +113,17 @@ EOF
         let &efm = s:efm
 
         cgetexpr(l:traceback)
+" If a range is run (starting other than at line 1), fix the reported error line numbers for
+" the current buffer
+        if a:line1 > 1
+            let qflist = getqflist()
+            for i in qflist
+                if i.bufnr == bufnr("")
+                    let i.lnum = i.lnum - 1 + a:line1
+                endif
+            endfor
+            call setqflist(qflist)
+        endif
 
         call pymode#QuickfixOpen(0, g:pymode_lint_hold, g:pymode_lint_maxheight, g:pymode_lint_minheight, 0)
         let &efm = l:_efm
diff --git a/autoload/pymode/virtualenv.vim b/autoload/pymode/virtualenv.vim
@@ -23,7 +23,13 @@ activate_this = os.path.join(os.path.join(ve_dir, 'bin'), 'activate_this.py')
 if not os.path.exists(activate_this):
     activate_this = os.path.join(os.path.join(ve_dir, 'Scripts'), 'activate_this.py')
 
-execfile(activate_this, dict(__file__=activate_this))
+f = open(activate_this)
+try:
+    source = f.read()
+finally:
+    f.close()
+
+exec(compile(source, activate_this, 'exec'), dict(__file__=activate_this))
 EOF
 
     call pymode#WideMessage("Activate virtualenv: ".$VIRTUAL_ENV)
