little fixes

3 files changed, 2 insertions, 8 deletions

diff --git a/module/PluginManager.py b/module/PluginManager.py
index 8bb5a5ec6..8f2a94ca9 100644
--- a/module/PluginManager.py
+++ b/module/PluginManager.py
@@ -156,7 +156,7 @@ class PluginManager():
                 res.append((url, last[0]))
                 continue
             
-            for name, value in chain(self.containerPlugins.iteritems(), self.crypterPlugins.iteritems(), self.hosterPlugins.iteritems() ):
+            for name, value in chain(self.crypterPlugins.iteritems(), self.hosterPlugins.iteritems(), self.containerPlugins.iteritems() ):
                 if value["re"].match(url):
                     res.append((url, name))
                     last = (name, value)
diff --git a/module/plugins/Container.py b/module/plugins/Container.py
index 1539ea37e..e7b7cc7d6 100644
--- a/module/plugins/Container.py
+++ b/module/plugins/Container.py
@@ -21,6 +21,7 @@ from module.plugins.Crypter import Crypter
 
 from os.path import join, exists, basename
 from os import remove
+import re
 
 class Container(Crypter):
     __name__ = "Container"
diff --git a/pyLoadCore.py b/pyLoadCore.py
index c2cb7976a..e211c59ca 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -51,13 +51,6 @@ from traceback import print_exc
 from xmlrpclib import Binary
 
 
-import locale
-import codecs
-encoding = locale.getlocale()[1]
-if not encoding:
-    encoding = "us-ascii"
-sys.stdout = codecs.getwriter(encoding)(sys.stdout, errors = "ignore")
-sys.stderr = codecs.getwriter(encoding)(sys.stderr, errors = "ignore")
 
 from module import InitHomeDir
 from module.AccountManager import AccountManager