Merge pull request python-mode#219 from alvinfrancis/unicode

klen · klen · commit 80918da85b13 · 2013-05-14T23:49:20.000-07:00
Use _get_encoding for encoding docstrings and messages
diff --git a/pylibs/ropevim.py b/pylibs/ropevim.py
@@ -268,9 +268,8 @@ def _writedefs(self, locations, filename):
 
     def show_doc(self, docs, altview=False):
         if docs:
-            vim.command(
-                'call pymode#ShowStr("{0}")'.format(docs.replace('"', '\\"'))
-            )
+            docs = docs.encode(self._get_encoding()).replace('"', '\\"')
+            vim.command('call pymode#ShowStr("{0}")'.format(docs))
 
     def preview_changes(self, diffs):
         echo(diffs)
@@ -380,17 +379,15 @@ def done(self):
 
 
 def echo(message):
-    if isinstance(message, unicode):
-        message = message.encode(vim.eval('&encoding'))
+    message = message.encode(VimUtils._get_encoding())
     print message
 
 
 def status(message):
     if _rope_quiet:
         return
 
-    if isinstance(message, unicode):
-        message = message.encode(vim.eval('&encoding'))
+    message = message.encode(VimUtils._get_encoding())
     vim.command('redraw | echon "{0}"'.format(message))
 
 
