Fix code running. Close python-mode#350, python-mode#354, python-mode#365

klen · klen · commit b92c9828e214 · 2014-03-12T16:53:24.000+07:00
diff --git a/Changelog.rst b/Changelog.rst
@@ -3,6 +3,7 @@ Changelog
 
     * Get fold's expression symbol from &fillchars;
     * Fixed error when setting g:pymode_breakpoint_cmd (expobrain);
+    * Fixed code running;
 
 
 ## 2013-12-04 0.7.8b
diff --git a/autoload/pymode/tools/loclist.vim b/autoload/pymode/tools/loclist.vim
@@ -70,7 +70,7 @@ fun! g:PymodeLocList.show() "{{{
         lclose
     else
         let num = winnr()
-        execute "lopen " . g:pymode_quickfix_maxheight
+        lopen
         execute max([min([line("$"), g:pymode_quickfix_maxheight]), g:pymode_quickfix_minheight]) . "wincmd _"
         if num != winnr()
             call setwinvar(winnr(), 'quickfix_title', self._title . ' <' . self._name . '>')
diff --git a/pymode/run.py b/pymode/run.py
@@ -8,14 +8,25 @@
 import sys
 
 from .environment import env
+from re import compile as re
+
+
+encoding = re(r'#[^\w]+coding:\s+utf.*$')
 
 
 def run_code():
-    """ Run python code in current buffer. """
+    """ Run python code in current buffer.
+
+    :returns: None
+
+    """
 
     errors, err = [], ''
     line1, line2 = env.var('a:line1'), env.var('a:line2')
     lines = __prepare_lines(line1, line2)
+    for ix in (0, 1):
+        if encoding.match(lines[ix]):
+            lines.pop(ix)
 
     context = dict(
         __name__='__main__', input=env.user_input, raw_input=env.user_input)
@@ -42,14 +53,14 @@ def run_code():
     else:
         err = sys.stderr.getvalue()
 
-    output = sys.stdout.getvalue().strip()
-    output = env.prepare_value(output)
+    output = sys.stdout.getvalue()
+    output = env.prepare_value(output, dumps=False)
     sys.stdout, sys.stderr = stdout_, stderr_
 
     errors += [er for er in err.splitlines() if er and "<string>" not in er]
 
     env.let('l:traceback', errors[2:])
-    env.let('l:output', [s for s in output.split('\n') if s])
+    env.let('l:output', [s for s in output.split('\n')])
 
 
 def __prepare_lines(line1, line2):
