Use utils encode/decode

2 files changed, 7 insertions, 6 deletions

diff --git a/pyload/utils/JsEngine.py b/pyload/utils/JsEngine.py
index ac3a7a7a9..f6f28f457 100644
--- a/pyload/utils/JsEngine.py
+++ b/pyload/utils/JsEngine.py
@@ -6,7 +6,7 @@ import sys
 from os import path
 from urllib import quote
 
-from pyload.utils import encode, uniqify
+from pyload.utils import encode, decode, uniqify
 
 
 class JsEngine:
@@ -214,7 +214,11 @@ class RhinoEngine(AbstractEngine):
     def eval(self, script):
         script = "print(eval(unescape('%s')))" % quote(script)
         args = ["java", "-cp", self.path, "org.mozilla.javascript.tools.shell.Main", "-e", script]
-        return self._eval(args).decode("utf-8").encode("ISO-8859-1")
+        res = decode(self._eval(args))
+        try:
+            return res.encode("ISO-8859-1")
+        finally:
+            return res
 
 
 class JscEngine(AbstractEngine):
diff --git a/pyload/utils/__init__.py b/pyload/utils/__init__.py
index 367aed5be..541dedbd8 100644
--- a/pyload/utils/__init__.py
+++ b/pyload/utils/__init__.py
@@ -84,10 +84,7 @@ def save_join(*args):
 
 if sys.getfilesystemencoding().startswith('ANSI'):
     def fs_encode(string):
-        try:
-            string = string.encode('utf-8')
-        finally:
-            return save_path(string)
+        return save_path(encode(string))
 
     fs_decode = decode #decode utf8