Fix encoding bug

klen · klen · commit ce879756b2d0 · 2013-12-05T12:07:08.000+07:00
diff --git a/AUTHORS b/AUTHORS
@@ -23,6 +23,7 @@ Contributors:
 * Lowe Thiderman (thiderman);
 * Martin Brochhaus (mbrochh);
 * Matthew Moses (mlmoses);
+* Mel Boyce (syngin)
 * Mohammed (mbadran);
 * Naoya Inada (naoina);
 * Pedro Algarvio (s0undt3ch);
diff --git a/Makefile b/Makefile
@@ -11,7 +11,6 @@ clean:
 # Temporary disable rope tests on Travis
 .PHONY: travis
 travis:
-	rm -rf t/rope.vim
 	rake test
 
 .PHONY: test
diff --git a/pymode/environment.py b/pymode/environment.py
@@ -77,7 +77,11 @@ def var(self, name, to_bool=False):
         return value
 
     def message(self, msg, history=False):
-        """ Show message to user. """
+        """ Show message to user.
+
+        :return: :None
+
+        """
 
         if history:
             return vim.command('echom "%s"' % str(msg))
@@ -188,14 +192,16 @@ def let(self, name, value):
         self.debug(cmd)
         vim.command(cmd)
 
-    def prepare_value(self, value):
+    def prepare_value(self, value, dumps=True):
         """ Decode bstr to vim encoding.
 
         :return unicode string:
 
         """
 
-        value = json.dumps(value)
+        if dumps:
+            value = json.dumps(value)
+
         if PY2:
             value = value.decode('utf-8').encode(self.options.get('encoding'))
 
diff --git a/pymode/rope.py b/pymode/rope.py
@@ -85,7 +85,9 @@ def complete(dot=False):
     s_offset = codeassist.starting_offset(source, offset)
     p_prefix = prefix[offset - s_offset:]
     line = env.lines[row - 1]
-    env.curbuf[row - 1] = line[:col] + p_prefix + line[col:] # noqa
+    cline = line[:col] + p_prefix + line[col:]
+    if cline != line:
+        env.curbuf[row - 1] = env.prepare_value(cline, dumps=False)
     env.current.window.cursor = (row, col + len(p_prefix))
     env.run('complete', col - len(prefix) + len(p_prefix) + 1, proposals)
     return True
@@ -887,7 +889,8 @@ def _insert_import(name, module, ctx):
         source, _ = env.get_offset_params()
         lineno = ctx.importer.find_insertion_line(source)
         line = 'from %s import %s' % (module, name)
-        env.curbuf[lineno - 1:lineno - 1] = [line]
+        env.curbuf[lineno - 1:lineno - 1] = [
+            env.prepare_value(line, dumps=False)]
         return True
 
     pyobject = ctx.project.pycore.resource_to_pyobject(ctx.resource)
diff --git a/t/rope.vim b/t/rope.vim
@@ -17,6 +17,11 @@ describe 'pymode-plugin'
     end
 
     it 'pymode rope auto open project in current working directory'
+
+        if $TRAVIS != ""
+            SKIP 'Travis fails on this test'
+        endif
+
         let project_path = getcwd() . '/.ropeproject'
         Expect isdirectory(project_path)  == 0
         normal oimporX
