From 52cf3751b2fe74aa5029f4b605b91aa84d9cf914 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Thu, 4 Feb 2010 16:17:22 +0100 Subject: little fixes, closed #71 --- pyLoadCore.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'pyLoadCore.py') diff --git a/pyLoadCore.py b/pyLoadCore.py index 39ea4727f..94abd2d08 100755 --- a/pyLoadCore.py +++ b/pyLoadCore.py @@ -45,6 +45,7 @@ from sys import executable from sys import exit from sys import path from sys import stdout +from sys import version_info from tempfile import NamedTemporaryFile import thread import time @@ -53,13 +54,13 @@ from xmlrpclib import Binary from module.CaptchaManager import CaptchaManager from module.HookManager import HookManager +from module.PullEvents import PullManager from module.XMLConfigParser import XMLConfigParser from module.file_list import File_List from module.network.Request import Request import module.remote.SecureXMLRPCServer as Server from module.thread_list import Thread_List from module.web.ServerThread import WebServer -from module.PullEvents import PullManager class Core(object): """ pyLoad Core """ @@ -139,7 +140,7 @@ class Core(object): self.lastGuiConnected = 0 self.server_methods = ServerMethods(self) - self.file_list = File_List(self) + self.file_list = File_List(self) self.pullManager = PullManager(self) self.thread_list = Thread_List(self) self.captchaManager = CaptchaManager(self) @@ -340,7 +341,7 @@ class Core(object): def check_update(self): try: if self.config['updates']['search_updates']: - version_check = Request().load("http://get.pyload.org/check/%s/" % (CURRENT_VERSION, )) + version_check = Request().load("http://get.pyload.org/check/%s/" % (CURRENT_VERSION,)) if version_check == "": self.logger.info(_("No Updates for pyLoad")) return False @@ -355,9 +356,9 @@ class Core(object): def install_update(self): if self.config['updates']['search_updates']: if self.core.config['updates']['install_updates']: - version_check = Request().load("http://get.pyload.org/get/update/%s/" % (CURRENT_VERSION, )) + version_check = Request().load("http://get.pyload.org/get/update/%s/" % (CURRENT_VERSION,)) else: - version_check = Request().load("http://get.pyload.org/check/%s/" % (CURRENT_VERSION, )) + version_check = Request().load("http://get.pyload.org/check/%s/" % (CURRENT_VERSION,)) if version_check == "": return False else: @@ -577,9 +578,9 @@ class ServerMethods(): return True else: return False - - def get_events(self, uuid): - return self.core.pullManager.getEvents(uuid) + + def get_events(self, uuid): + return self.core.pullManager.getEvents(uuid) #def move_urls_up(self, ids): # for id in ids: -- cgit v1.2.3