From 5c1fb051fcbc7842bb4f6e879684cda9d7a14cdb Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 18 Jul 2011 00:06:18 +0200 Subject: closed #364, changes to online check api --- module/ThreadManager.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'module/ThreadManager.py') diff --git a/module/ThreadManager.py b/module/ThreadManager.py index ba75764c5..07ab69548 100644 --- a/module/ThreadManager.py +++ b/module/ThreadManager.py @@ -112,11 +112,7 @@ class ThreadManager: @lock def setInfoResults(self, rid, result): - for k, v in result.iteritems(): - if k in self.infoResults[rid]: - self.infoResults[rid][k].update(v) - else: - self.infoResults[rid][k] = v + self.infoResults[rid].update(result) def downloadingIds(self): """get a list of the currently downloading pyfile's ids""" @@ -211,7 +207,7 @@ class ThreadManager: def getIP(self): """retrieve current ip""" - services = [("http://www.whatismyip.com/automation/n09230945.asp", "(\S+)"), + services = [("http://automation.whatismyip.com/n09230945.asp", "(\S+)"), ("http://checkip.dyndns.org/",".*Current IP Address: (\S+).*")] ip = "" -- cgit v1.2.3