Spring cleanup

couchpotato/core/_base/_core.py

@@ -189,7 +189,7 @@ class Core(Plugin):
     def signalHandler(self):
         if Env.get('daemonized'): return
 
-        def signal_handler(signal, frame):
+        def signal_handler(*args, **kwargs):
             fireEvent('app.shutdown', single = True)
 
         signal.signal(signal.SIGINT, signal_handler)

couchpotato/core/_base/clientscript.py

@@ -57,13 +57,12 @@ class ClientScript(Plugin):
         ],
     }
 
-
     urls = {'style': {}, 'script': {}}
     minified = {'style': {}, 'script': {}}
     paths = {'style': {}, 'script': {}}
     comment = {
-       'style': '/*** %s:%d ***/\n',
-       'script': '// %s:%d\n'
+        'style': '/*** %s:%d ***/\n',
+        'script': '// %s:%d\n'
     }
 
     html = {
@@ -95,7 +94,6 @@ class ClientScript(Plugin):
                 else:
                     self.registerStyle(core_url, file_path, position = 'front')
 
-
     def minify(self):
 
         # Create cache dir
@@ -129,7 +127,7 @@ class ClientScript(Plugin):
                 data = cssmin(data)
                 data = data.replace('../images/', '../static/images/')
                 data = data.replace('../fonts/', '../static/fonts/')
-                data = data.replace('../../static/', '../static/') # Replace inside plugins
+                data = data.replace('../../static/', '../static/')  # Replace inside plugins
 
             raw.append({'file': file_path, 'date': int(os.path.getmtime(file_path)), 'data': data})
 
@@ -192,6 +190,7 @@ class ClientScript(Plugin):
 
     prefix_properties = ['border-radius', 'transform', 'transition', 'box-shadow']
     prefix_tags = ['ms', 'moz', 'webkit']
+
     def prefix(self, data):
 
         trimmed_data = re.sub('(\t|\n|\r)+', '', data)

couchpotato/core/_base/updater/main.py

@@ -164,14 +164,14 @@ class BaseUpdater(Plugin):
 
     def info(self):
 
-        version = self.getVersion()
+        current_version = self.getVersion()
 
         return {
             'last_check': self.last_check,
             'update_version': self.update_version,
-            'version': version,
+            'version': current_version,
             'repo_name': '%s/%s' % (self.repo_user, self.repo_name),
-            'branch': version.get('branch', self.branch),
+            'branch': current_version.get('branch', self.branch),
         }
 
     def getVersion(self):

couchpotato/core/_base/updater/static/updater.js

@@ -5,7 +5,7 @@ var UpdaterBase = new Class({
 	initialize: function(){
 		var self = this;
 
-		App.addEvent('load', self.info.bind(self, 2000))
+		App.addEvent('load', self.info.bind(self, 2000));
 		App.addEvent('unload', function(){
 			if(self.timer)
 				clearTimeout(self.timer);
@@ -66,7 +66,7 @@ var UpdaterBase = new Class({
 
 		var changelog = 'https://github.com/'+data.repo_name+'/compare/'+data.version.hash+'...'+data.branch;
 		if(data.update_version.changelog)
-			changelog = data.update_version.changelog + '#' + data.version.hash+'...'+data.update_version.hash
+			changelog = data.update_version.changelog + '#' + data.version.hash+'...'+data.update_version.hash;
 
 		self.message = new Element('div.message.update').adopt(
 			new Element('span', {