Fix test_str_encode_cp1251 (issue PythonCharmers#14)

edschofield · edschofield · commit 9c7813023281 · 2013-11-11T20:51:04.000+11:00
diff --git a/future/builtins/backports/newstr.py b/future/builtins/backports/newstr.py
@@ -83,10 +83,10 @@ def __new__(cls, *args, **kwargs):
         elif isinstance(args[0], unicode):
             value = args[0]
         elif isinstance(args[0], bytes):
-            if 'encoding' not in kwargs:
-                value = args[0].__str__()
+            if 'encoding' in kwargs or len(args) > 1:
+                value = args[0].decode(*args[1:], **kwargs)
             else:
-                value = args[0].encode(**kwargs)
+                value = args[0].__str__()
         else:
             value = args[0]
         return super(newstr, cls).__new__(cls, value)
