General fixup (1)

2 files changed, 8 insertions, 4 deletions

diff --git a/pyload/manager/Account.py b/pyload/manager/Account.py
index b743ccabc..8274c6592 100644
--- a/pyload/manager/Account.py
+++ b/pyload/manager/Account.py
@@ -7,7 +7,7 @@ import shutil
 import threading
 
 from pyload.manager.Event import AccountUpdateEvent
-from pyload.utils import chmod, lock
+from pyload.utils import lock
 
 
 ACC_VERSION = 1
@@ -132,7 +132,10 @@ class AccountManager(object):
                             for option, values in data['options'].iteritems():
                                 f.write("\t@%s %s\n" % (option, " ".join(values)))
 
-            os.chmod(f.name, 0600)
+            try:
+                os.chmod(f.name, 0600)
+            except Exception:
+                pass
 
         except Exception, e:
             self.core.log.error(str(e))
diff --git a/pyload/manager/Addon.py b/pyload/manager/Addon.py
index a632111ea..65afb4b0f 100644
--- a/pyload/manager/Addon.py
+++ b/pyload/manager/Addon.py
@@ -8,8 +8,9 @@ import threading
 import traceback
 import types
 
+import SafeEval
+
 from pyload.Thread import AddonThread
-from pyload.manager.Plugin import literal_eval
 from pyload.utils import lock
 
 
@@ -90,7 +91,7 @@ class AddonManager(object):
         if not args:
             args = ()
         if parse:
-            args = tuple([literal_eval(x) for x in args])
+            args = tuple([SafeEval.const_eval(x) for x in args])
         plugin = self.pluginMap[plugin]
         f = getattr(plugin, func)
         return f(*args)