Be more correct about encoding/decoding strings under py3. Patch by aeruder.

doc/UltiSnips.txt

@@ -1384,6 +1384,7 @@ individuals have contributed to UltiSnips (in chronological order):
    Pedro Ferrari - petobens
    Ches Martin - ches
    Christian - Oberon00
+   Andrew Ruder - aeruder
 
 Thank you for your support.
 

pythonx/UltiSnips/compatibility.py

@@ -10,22 +10,21 @@ import sys
 
 import vim  # pylint:disable=import-error
 
+if sys.version_info >= (3, 0):
     def _vim_dec(string):
         """Decode 'string' using &encoding."""
-    try:
+        # We don't have the luxury here of failing, everything
-        return string.decode(vim.eval("&encoding"))
+        # falls apart if we don't return a bytearray from the
-    except UnicodeDecodeError:
+        # passed in string
-        # At least we tried. There might be some problems down the road now
+        return string.decode(vim.eval("&encoding"), "replace")
-        return string
 
-def _vim_enc(string):
+    def _vim_enc(bytearray):
         """Encode 'string' using &encoding."""
-    try:
+        # We don't have the luxury here of failing, everything
-        return string.encode(vim.eval("&encoding"))
+        # falls apart if we don't return a string from the passed
-    except UnicodeEncodeError:
+        # in bytearray
-        return string
+        return bytearray.encode(vim.eval("&encoding"), "replace")
 
-if sys.version_info >= (3, 0):
     def open_ascii_file(filename, mode):
         """Opens a file in "r" mode."""
         return open(filename, mode, encoding="utf-8")
@@ -60,6 +59,22 @@ if sys.version_info >= (3, 0):
 else:
     import warnings
     warnings.filterwarnings("ignore", category=DeprecationWarning)
+
+    def _vim_dec(string):
+        """Decode 'string' using &encoding."""
+        try:
+            return string.decode(vim.eval("&encoding"))
+        except UnicodeDecodeError:
+            # At least we tried. There might be some problems down the road now
+            return string
+
+    def _vim_enc(string):
+        """Encode 'string' using &encoding."""
+        try:
+            return string.encode(vim.eval("&encoding"))
+        except UnicodeEncodeError:
+            return string
+
     def open_ascii_file(filename, mode):
         """Opens a file in "r" mode."""
         return open(filename, mode)