Code cleanup

klen · klen · commit 64cafbea2087 · 2013-12-03T13:29:15.000+07:00
diff --git a/pymode/run.py b/pymode/run.py
@@ -33,7 +33,7 @@ def run_code():
             # A false code will be treated as a
             # successful run, and the error will be hidden from Vim
             env.error("Script exited with code %s" % e.code)
-            env.stop()
+            return env.stop()
 
     except Exception:
         import traceback
@@ -43,13 +43,9 @@ def run_code():
         err = sys.stderr.getvalue()
 
     output = sys.stdout.getvalue().strip()
+    output = env.prepare_value(output)
     sys.stdout, sys.stderr = stdout_, stderr_
 
-    try:
-        output = output.decode('utf-8').encode(env.options.get('encoding'))
-    except AttributeError:
-        pass
-
     errors += [er for er in err.splitlines() if er and "<string>" not in er]
 
     env.let('l:traceback', errors[2:])
diff --git a/pymode/utils.py b/pymode/utils.py
@@ -1,5 +1,4 @@
 """ Pymode utils. """
-import json
 import os.path
 import sys
 import threading
@@ -18,92 +17,6 @@
 PY2 = sys.version_info[0] == 2
 
 
-def pymode_message(content):
-    """ Show message. """
-
-    vim.command('call pymode#wide_message("%s")' % str(content))
-
-
-def pymode_confirm(yes=True, msg='Do the changes:'):
-    """ Confirmation.
-
-    :return bool:
-
-    """
-    default = 'yes' if yes else 'no'
-    action = pymode_input(msg, default)
-    return action and 'yes'.startswith(action)
-
-
-def pymode_inputlist(msg, opts):
-    """ Get user choice.
-
-    :return str: A choosen option
-
-    """
-    choices = ['[Pymode] %s' % msg]
-    choices += ["%s. %s" % (num, opt) for num, opt in enumerate(opts, 1)]
-    try:
-        input_str = int(vim.eval('inputlist(%s)' % json.dumps(choices)))
-    except (KeyboardInterrupt, ValueError):
-        input_str = 0
-
-    if not input_str:
-        pymode_message('Cancelled!')
-        return False
-
-    try:
-        return opts[input_str - 1]
-    except (IndexError, ValueError):
-        pymode_error('Invalid option: %s' % input_str)
-        return pymode_inputlist(msg, opts)
-
-
-def pymode_input(umsg, udefault='', opts=None):
-    """ Get user input.
-
-    :return str: A user input
-
-    """
-    msg = '[Pymode] %s ' % umsg
-    default = udefault
-
-    if default != '':
-        msg += '[%s] ' % default
-
-    try:
-        vim.command('echohl Debug')
-        input_str = vim.eval('input("%s> ")' % msg)
-        vim.command('echohl none')
-    except KeyboardInterrupt:
-        input_str = ''
-
-    return input_str or default
-
-
-def pymode_error(content):
-    """ Show error. """
-
-    vim.command('call pymode#error("%s")' % str(content))
-
-
-def catch_and_print_exceptions(func):
-    """ Catch any exception.
-
-    :return func:
-
-    """
-    def wrapper(*args, **kwargs):
-        try:
-            return func(*args, **kwargs)
-        except (Exception, vim.error) as e: # noqa
-            if DEBUG:
-                raise
-            pymode_error(e)
-            return None
-    return wrapper
-
-
 @contextmanager
 def silence_stderr():
     """ Redirect stderr. """
@@ -127,12 +40,3 @@ def patch_paths():
         sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'libs2'))
     else:
         sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'libs3'))
-
-
-debug = lambda _: None
-
-if DEBUG:
-    def debug(msg): # noqa
-        """ Debug message. """
-
-        print(msg)
