Make try_decode a no-op in Python 3

sebastinas · sebastinas · commit 6e38d183a643 · 2015-02-19T03:25:33.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/_py3compat.py b/bpython/_py3compat.py
@@ -51,11 +51,15 @@ def prepare_for_exec(arg, encoding=None):
         return arg.encode(encoding)
 
 
-def try_decode(s, encoding):
-    """Try to decode s which is str names. Return None if not decodable"""
-    if not py3 and not isinstance(s, unicode):
-        try:
-            return s.decode(encoding)
-        except UnicodeDecodeError:
-            return None
-    return s
+if py3:
+    def try_decode(s, encoding):
+        return s
+else:
+    def try_decode(s, encoding):
+        """Try to decode s which is str names. Return None if not decodable"""
+        if not isinstance(s, unicode):
+            try:
+                return s.decode(encoding)
+            except UnicodeDecodeError:
+                return None
+        return s
