Some file encoding fixup + optimizations

1 files changed, 11 insertions, 12 deletions

diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py
index b2b4548a2..3d9a1e811 100644
--- a/module/plugins/hooks/ExternalScripts.py
+++ b/module/plugins/hooks/ExternalScripts.py
@@ -1,10 +1,9 @@
 # -*- coding: utf-8 -*-
 
+import os
 import subprocess
 
 from itertools import chain
-from os import listdir, access, X_OK, makedirs
-from os.path import join, exists, basename, abspath
 
 from module.plugins.Hook import Hook
 from module.utils import save_join
@@ -47,40 +46,40 @@ class ExternalScripts(Hook):
         for folder in folders:
             self.scripts[folder] = []
 
-            self.initPluginType(folder, join(pypath, 'scripts', folder))
-            self.initPluginType(folder, join('scripts', folder))
+            self.initPluginType(folder, os.path.join(pypath, 'scripts', folder))
+            self.initPluginType(folder, os.path.join('scripts', folder))
 
         for script_type, names in self.scripts.iteritems():
             if names:
-                self.logInfo(_("Installed scripts for"), script_type, ", ".join([basename(x) for x in names]))
+                self.logInfo(_("Installed scripts for"), script_type, ", ".join([os.path.basename(x) for x in names]))
 
 
     def initPluginType(self, folder, path):
-        if not exists(path):
+        if not os.path.exists(path):
             try:
-                makedirs(path)
+                os.makedirs(path)
             except Exception:
                 self.logDebug("Script folder %s not created" % folder)
                 return
 
-        for f in listdir(path):
+        for f in os.listdir(path):
             if f.startswith("#") or f.startswith(".") or f.startswith("_") or f.endswith("~") or f.endswith(".swp"):
                 continue
 
-            if not access(join(path, f), X_OK):
+            if not os.access(os.path.join(path, f), os.X_OK):
                 self.logWarning(_("Script not executable:") + " %s/%s" % (folder, f))
 
-            self.scripts[folder].append(join(path, f))
+            self.scripts[folder].append(os.path.join(path, f))
 
 
     def callScript(self, script, *args):
         try:
             cmd = [script] + [str(x) if not isinstance(x, basestring) else x for x in args]
-            self.logDebug("Executing", abspath(script), " ".join(cmd))
+            self.logDebug("Executing", os.path.abspath(script), " ".join(cmd))
             #output goes to pyload
             subprocess.Popen(cmd, bufsize=-1)
         except Exception, e:
-            self.logError(_("Error in %(script)s: %(error)s") % {"script": basename(script), "error": e})
+            self.logError(_("Error in %(script)s: %(error)s") % {"script": os.path.basename(script), "error": e})
 
 
     def downloadPreparing(self, pyfile):