thread killing improved; processing SIGTERM implementedHEADmaster

12 files changed, 127 insertions, 129 deletions

diff --git a/BlackSmith.py b/BlackSmith.py
index 593500b..f450de3 100644
--- a/BlackSmith.py
+++ b/BlackSmith.py
@@ -175,11 +175,11 @@ def check_sqlite():
 
 def exc_info():
 	exc, err, tb = sys.exc_info()
-	try:
-		exc, err = exc.__name__, err[0]
-	except Exception:
-		exc, err = str(exc), str(err)
-	return exc, err
+	if exc and err:
+		exc = exc.__name__
+		if err.args:
+			err = err[0]
+	return (exc, err)
 
 def exc_info_(fp = None):
 	try:
@@ -198,12 +198,12 @@ def get_exc():
 
 exc_str = lambda err, data = "%s - %s": data % (err.__class__.__name__, err[0] if err.args else None)
 
-def apply(instance, args = ()):
+def apply(instance, args = (), kwargs = {}):
 	try:
-		code = instance(*args)
-	except:
-		code = None
-	return code
+		data = instance(*args, **kwargs)
+	except Exception:
+		data = None
+	return data
 
 def text_color(text, color):
 	if eColors and color:
@@ -268,7 +268,7 @@ ConDispFile = static % ("clients.ini")
 ChatsFile = dynamic % ("chats.db")
 ChatsFileBackup = dynamic % ("chats.cp")
 
-(BsMark, BsVer, BsRev) = (2, 50, 0)
+(BsMark, BsVer, BsRev) = (2, 52, 0)
 
 if os.access(SvnCache, os.R_OK):
 	Cache = open(SvnCache).readlines()
@@ -368,13 +368,13 @@ Sequence = ithr.Semaphore()
 def execute_handler(handler_instance, list = (), command = None):
 	try:
 		handler_instance(*list)
-	except KeyboardInterrupt:
+	except SystemExit:
 		pass
-	except ithr.ThrKill:
+	except KeyboardInterrupt:
 		pass
 	except SelfExc:
 		pass
-	except:
+	except Exception:
 		collectExc(handler_instance, command)
 
 def call_sfunctions(ls, list = ()):
@@ -384,9 +384,9 @@ def call_sfunctions(ls, list = ()):
 def composeTimer(sleep, handler, name = None, list = (), command = None):
 	if not name:
 		name = "iTimer-%s" % (ithr.aCounter._str())
-	Timer = ithr.Timer(sleep, execute_handler, (handler, list, command,))
-	Timer.name = name
-	return Timer
+	timer = ithr.Timer(sleep, execute_handler, (handler, list, command,))
+	timer.name = name
+	return timer
 
 def composeThr(handler, name, list = (), command = None):
 	if not name.startswith(sBase[13]):
@@ -400,7 +400,7 @@ def startThr(thr, number = 0):
 		thr.start()
 	except ithr.error:
 		startThr(thr, (number + 1))
-	except:
+	except Exception:
 		collectExc(thr.start)
 
 def sThread_Run(thr, handler, command = None):
@@ -414,7 +414,7 @@ def sThread_Run(thr, handler, command = None):
 				thr._run_backup()
 			except Exception:
 				collectExc(handler, command)
-	except:
+	except Exception:
 		collectExc(sThread_Run, command)
 
 def sThread(name, inst, list = (), command = None):
@@ -511,7 +511,7 @@ class expansion(object):
 				execfile(self.insc, globals())
 			execfile(self.file, globals())
 			exp_inst = expansion_temp(self.name)
-		except:
+		except Exception:
 			exp = (None, exc_info())
 		else:
 			exp = (exp_inst, ())
@@ -577,7 +577,7 @@ def command_handler(exp_inst, handler, default, access, prefix = True):
 	Path = os.path.join(ExpsDir, exp_inst.name, default)
 	try:
 		commands = eval(get_file("%s.name" % Path).decode("utf-8"))
-	except:
+	except Exception:
 		commands = {}
 	if commands.has_key(DefLANG):
 		name = commands[DefLANG].decode("utf-8")
@@ -827,8 +827,6 @@ def delivery(body):
 		Print("\n\n%s" % (body), color1)
 	except SelfExc:
 		Print("\n\n%s" % (body), color1)
-	except ithr.ThrKill:
-		raise
 	except Exception:
 		exc_info_()
 
@@ -871,7 +869,7 @@ def Answer(body, stype, source, disp = None):
 		instance = source[1]
 	Message(instance, body, disp)
 
-def CheckFlood(disp):
+def checkFlood(disp):
 	disp = get_disp(disp)
 	if disp in Guard:
 		desc = Guard[disp]
@@ -954,8 +952,6 @@ def Sender(disp, stanza):
 		pass
 	except SelfExc as exc:
 		Print(exc_str(exc, "\n\n%s: %s!"), color2)
-	except ithr.ThrKill:
-		raise
 	except Exeption:
 		collectExc(Sender)
 
@@ -975,7 +971,7 @@ def sAttrs(stanza):
 	return (source, instance.lower(),
 					stype, resource)
 
-GetRole = lambda node: (str(node.getAffiliation()), str(node.getRole()))
+getRole = lambda node: (str(node.getAffiliation()), str(node.getRole()))
 
 def xmpp_raise():
 	raise xmpp.NodeProcessed("continue")
@@ -993,7 +989,7 @@ def initialize_file(filename, data = "{}"):
 		if folder and not os.path.exists(folder):
 			os.makedirs(folder, 0755)
 		cat_file(filename, data)
-	except:
+	except Exception:
 		return False
 	return True
 
@@ -1034,7 +1030,7 @@ def collectExc(inst, command = None):
 		with open(filename, "wb") as fp:
 			Info["cfw"].plus()
 			exc_info_(fp)
-	except:
+	except Exception:
 		exc_info_()
 		if GetExc and online(GenDisp):
 			delivery(error)
@@ -1062,7 +1058,7 @@ def load_expansions():
 			if exp:
 				try:
 					exp.initialize_exp()
-				except:
+				except Exception:
 					exc = exc_info()
 					exp.dels(True)
 					Print("Can't init - %s!%s" % (expDir, "\n\t* %s: %s" % exc), color2)
@@ -1114,10 +1110,9 @@ class Web(object):
 		fp = self.open(header)
 		info = fp.info()
 		size = info.get("Content-Length", -1)
-		if isNumber(size):
-			size = int(size)
-		else:
+		if not isNumber(size):
 			raise SelfExc("no info about file's size")
+		size = int(size)
 		if not filename:
 			disp = info.get("Content-Disposition")
 			if disp:
@@ -1230,7 +1225,7 @@ def check_copies():
 			cache = eval(get_file(PidFile))
 		except SyntaxError:
 			del_file(PidFile)
-		except:
+		except Exception:
 			pass
 		else:
 			try:
@@ -1239,8 +1234,10 @@ def check_copies():
 				elif OSList[0]:
 					get_pipe(cmdsDb[4] % (cache["PID"])); raise SelfExc()
 				else:
+					os.kill(cache["PID"], 15)
+					sleep(2)
 					os.kill(cache["PID"], 9); raise SelfExc()
-			except:
+			except Exception:
 				cache = base
 	apply(cat_file, (PidFile, str(cache)))
 	del cache["PID"]; Info.update(cache)
@@ -1268,7 +1265,7 @@ def join_chats():
 
 # Presence Handler
 
-def XmppPresenceCB(disp, stanza):
+def xmppPresenceCB(disp, stanza):
 	Info["prs"].plus()
 	(source, conf, stype, nick) = sAttrs(stanza)
 	if not enough_access(conf, nick):
@@ -1303,7 +1300,7 @@ def XmppPresenceCB(disp, stanza):
 							composeTimer(360, ejoinTimer, TimerName, (conf,)).start()
 						except ithr.error:
 							delivery(AnsBase[20] % (ecode, eCodesDesc[ecode], conf))
-						except:
+						except Exception:
 							collectExc(ithr.Thread.start)
 				elif ecode == eCodes[4]:
 					Chat.full_leave(eCodesDesc[ecode])
@@ -1314,7 +1311,7 @@ def XmppPresenceCB(disp, stanza):
 		elif stype in (sBase[3], None):
 			if Chat.nick == nick:
 				Chat.IamHere = True
-			role = GetRole(stanza)
+			role = getRole(stanza)
 			inst = stanza.getJid()
 			if not inst:
 				if Chat.isModer:
@@ -1327,7 +1324,7 @@ def XmppPresenceCB(disp, stanza):
 					xmpp_raise()
 			else:
 				inst = (inst.split(chr(47)))[0].lower()
-				if not Chat.isModer and Chat.nick == nick and aDesc.get(role[0], 0) >= 2:
+				if not Chat.isModer and Chat.nick == nick and aDesc.get(role[0], 0) > 1:
 					Chat.isModer = True
 					Chat.leave(AnsBase[25])
 					sleep(0.4)
@@ -1352,7 +1349,7 @@ def XmppPresenceCB(disp, stanza):
 					inst = stanza.getJid()
 					if inst:
 						inst = (inst.split(chr(47)))[0].lower()
-					role = GetRole(stanza)
+					role = getRole(stanza)
 					if Chat.isHereTS(Nick) and Chat.isHe(Nick, inst):
 						Chat.aroles_change(Nick, role, stanza)
 					else:
@@ -1367,7 +1364,7 @@ def XmppPresenceCB(disp, stanza):
 
 # Iq Handler
 
-def XmppIqCB(disp, stanza):
+def xmppIqCB(disp, stanza):
 	Info["iq"].plus()
 	ResponseChecker(disp, stanza)
 	(source, inst, stype, nick) = sAttrs(stanza)
@@ -1430,7 +1427,7 @@ class Macro:
 
 Macro = Macro()
 
-def XmppMessageCB(disp, stanza):
+def xmppMessageCB(disp, stanza):
 	Info["msg"].plus()
 	(source, inst, stype, nick) = sAttrs(stanza)
 	if not enough_access(inst, nick):
@@ -1445,7 +1442,7 @@ def XmppMessageCB(disp, stanza):
 	elif not enough_access(inst, nick, 7):
 		if not Roster["on"]:
 			xmpp_raise()
-		CheckFlood(disp)
+		checkFlood(disp)
 	botNick = (Chat.nick if isConf else DefNick)
 	if nick == botNick:
 		xmpp_raise()
@@ -1548,16 +1545,15 @@ def connect_client(inst, attrs):
 	try:
 		disp.getRoster()
 	except IOError:
-		if disp.isConnected():
-			disp.Roster = None
-		else:
+		if not disp.isConnected():
 			return (False, None)
+		disp.Roster = None
 	except Exception:
 		disp.Roster = None
 	disp.RespExp = {}
-	disp.RegisterHandler(xmpp.NS_PRESENCE, XmppPresenceCB)
-	disp.RegisterHandler(xmpp.NS_IQ, XmppIqCB)
-	disp.RegisterHandler(xmpp.NS_MESSAGE, XmppMessageCB)
+	disp.RegisterHandler(xmpp.NS_PRESENCE, xmppPresenceCB)
+	disp.RegisterHandler(xmpp.NS_IQ, xmppIqCB)
+	disp.RegisterHandler(xmpp.NS_MESSAGE, xmppMessageCB)
 	Clients[inst] = disp
 	Sender(disp, caps_add(xmpp.Presence(show = sList[0], status = DefStatus)))
 	return (True, inst)
@@ -1602,7 +1598,7 @@ def Dispatcher(disp):
 					raise IOError("disconnected!")
 		except KeyboardInterrupt:
 			break
-		except ithr.ThrKill:
+		except SystemExit:
 			break
 		except IOError:
 			disp = get_disp(disp)
@@ -1623,7 +1619,7 @@ def Dispatcher(disp):
 			zero = itypes.Number()
 		except xmpp.StreamError:
 			pass
-		except:
+		except Exception:
 			collectDFail()
 			if Info["errors"].plus() >= len(Clients.keys())*8:
 				sys_exit("Dispatch Errors!")
@@ -1674,6 +1670,8 @@ if __name__ == "__main__":
 		load_mark2()
 	except KeyboardInterrupt:
 		sys_exit("Interrupt (Ctrl+C)")
+	except SystemExit:
+		sys_exit("Got ~SIGTERM")
 	except:
 		collectExc(load_mark2)
 		sys_exit("Critical Fail!")
diff --git a/expansions/alive_keeper/code.py b/expansions/alive_keeper/code.py
index 2c8ae73..c467595 100644
--- a/expansions/alive_keeper/code.py
+++ b/expansions/alive_keeper/code.py
@@ -33,7 +33,7 @@ class expansion_temp(expansion):
 						composeThr(connectAndDispatch, thrName, (disp_str,)).start()
 					except ithr.error:
 						delivery(AnsBase[28] % (disp_str))
-					except:
+					except Exception:
 						collectExc(ithr.Thread.start)
 				elif expansions.has_key(self.name):
 					disp.aKeeper.plus()
@@ -72,7 +72,7 @@ class expansion_temp(expansion):
 							composeTimer(180, ejoinTimer, TimerName, (conf.name,)).start()
 						except ithr.error:
 							pass
-						except:
+						except Exception:
 							collectExc(ithr.Thread.start)
 				elif expansions.has_key(self.name):
 					conf.aKeeper.plus()
diff --git a/expansions/allweb/code.py b/expansions/allweb/code.py
index e5f41ca..bc29ecc 100644
--- a/expansions/allweb/code.py
+++ b/expansions/allweb/code.py
@@ -51,7 +51,7 @@ class expansion_temp(expansion):
 						Numb = int(Char, c06)
 						assert (-1 < Numb < 65535)
 						Char = unichr(Numb)
-					except:
+					except Exception:
 						Char = self.edefs.get(Char, "&%s;" % co)
 				else:
 					Char = self.edefs.get(co, "&%s;" % co)
@@ -79,7 +79,7 @@ class expansion_temp(expansion):
 				data = Opener.get_page(self.UserAgent)
 			except Web.Two.HTTPError as exc:
 				answer = str(exc)
-			except:
+			except Exception:
 				answer = self.AnsBase[0]
 			else:
 				data = data.decode("utf-8")
@@ -110,12 +110,12 @@ class expansion_temp(expansion):
 					data = Opener.get_page(self.UserAgent)
 				except Web.Two.HTTPError as exc:
 					answer = str(exc)
-				except:
+				except Exception:
 					answer = self.AnsBase[0]
 				else:
 					try:
 						data = self.json.loads(data)
-					except:
+					except Exception:
 						answer = self.AnsBase[1]
 					else:
 						try:
@@ -185,12 +185,12 @@ class expansion_temp(expansion):
 							data = Opener.get_page(self.UserAgent_Moz)
 						except Web.Two.HTTPError as exc:
 							answer = str(exc)
-						except:
+						except Exception:
 							answer = self.AnsBase[0]
 						else:
 							try:
 								data = self.json.loads(data)
-							except:
+							except Exception:
 								answer = self.AnsBase[1]
 							else:
 								try:
@@ -278,7 +278,7 @@ class expansion_temp(expansion):
 					data = Opener.get_page(self.UserAgent_Moz)
 				except Web.Two.HTTPError as exc:
 					answer = str(exc)
-				except:
+				except Exception:
 					answer = self.AnsBase[0]
 				else:
 					data = data.decode("cp1251")
@@ -310,7 +310,7 @@ class expansion_temp(expansion):
 					data = Opener.get_page(self.UserAgent_Moz)
 				except Web.Two.HTTPError as exc:
 					answer = str(exc)
-				except:
+				except Exception:
 					answer = self.AnsBase[0]
 				else:
 					data = data.decode("cp1251")
@@ -338,7 +338,7 @@ class expansion_temp(expansion):
 						data = Opener.get_page(self.UserAgent_Moz)
 					except Web.Two.HTTPError as exc:
 						answer = str(exc)
-					except:
+					except Exception:
 						answer = self.AnsBase[0]
 					else:
 						data = data.decode("cp1251")
@@ -390,12 +390,12 @@ class expansion_temp(expansion):
 					data = Opener.get_page(self.UserAgent_Moz)
 				except Web.Two.HTTPError as exc:
 					answer = str(exc)
-				except:
+				except Exception:
 					answer = self.AnsBase[0]
 				else:
 					try:
 						data = self.json.loads(data)
-					except:
+					except Exception:
 						answer = self.AnsBase[1]
 					else:
 						try:
@@ -435,12 +435,12 @@ class expansion_temp(expansion):
 					data = Opener.get_page(self.UserAgent_Moz)
 				except Web.Two.HTTPError as exc:
 					answer = str(exc)
-				except:
+				except Exception:
 					answer = self.AnsBase[0]
 				else:
 					try:
 						data = self.json.loads(data)
-					except:
+					except Exception:
 						answer = self.AnsBase[1]
 					else:
 						ls = ["\->"]
@@ -482,12 +482,12 @@ class expansion_temp(expansion):
 						data = Opener.get_page(self.UserAgent_Moz)
 					except Web.Two.HTTPError as exc:
 						answer = str(exc)
-					except:
+					except Exception:
 						answer = self.AnsBase[0]
 					else:
 						try:
 							data = self.json.loads(data)
-						except:
+						except Exception:
 							answer = self.AnsBase[1]
 						else:
 							try:
@@ -518,7 +518,7 @@ class expansion_temp(expansion):
 			data = Opener.get_page(self.UserAgent)
 		except Web.Two.HTTPError as exc:
 			answer = str(exc)
-		except:
+		except Exception:
 			answer = self.AnsBase[0]
 		else:
 			data = data.decode("koi8-r")
@@ -541,12 +541,12 @@ class expansion_temp(expansion):
 				data = Opener.get_page(self.UserAgent)
 			except Web.Two.HTTPError as exc:
 				answer = str(exc)
-			except:
+			except Exception:
 				answer = self.AnsBase[0]
 			else:
 				try:
 					data = self.json.loads(data)
-				except:
+				except Exception:
 					answer = self.AnsBase[1]
 				else:
 					try:
@@ -617,7 +617,7 @@ class expansion_temp(expansion):
 						if not os.path.isdir(folder):
 							try:
 								os.makedirs(folder)
-							except:
+							except Exception:
 								link = None
 						if AsciiSys:
 							folder = folder.decode("utf-8")
@@ -630,7 +630,7 @@ class expansion_temp(expansion):
 							answer = str(exc)
 						except SelfExc as exc:
 							answer = "Error! %s." % exc[0].capitalize()
-						except:
+						except Exception:
 							answer = self.AnsBase[0]
 						else:
 							answer = "Done.\nPath: %s\nSize: %s" % (data[0], Size2Text(data[2]))
@@ -664,7 +664,7 @@ class expansion_temp(expansion):
 					fp.close()
 				except Web.Two.HTTPError as exc:
 					answer = str(exc)
-				except:
+				except Exception:
 					answer = self.AnsBase[0]
 		else:
 			answer = self.AnsBase[8] + str.join(chr(10), ["%s - %s" % (k, l) for k, l in sorted(self.PasteLangs.items())])
@@ -684,7 +684,7 @@ class expansion_temp(expansion):
 				data = Opener.get_page(self.UserAgent)
 			except Web.Two.HTTPError as exc:
 				answer = str(exc)
-			except:
+			except Exception:
 				answer = self.AnsBase[0]
 			else:
 				data = data.decode("cp1251")
@@ -705,7 +705,7 @@ class expansion_temp(expansion):
 				data = Opener.get_page(self.UserAgent)
 			except Web.Two.HTTPError as exc:
 				answer = str(exc)
-			except:
+			except Exception:
 				answer = self.AnsBase[0]
 			else:
 				data = data.decode("cp1251")
@@ -725,7 +725,7 @@ class expansion_temp(expansion):
 				data = Opener.get_page(self.UserAgent)
 			except Web.Two.HTTPError as exc:
 				answer = str(exc)
-			except:
+			except Exception:
 				answer = self.AnsBase[0]
 			else:
 				data = data.decode("utf-8")
@@ -746,7 +746,7 @@ class expansion_temp(expansion):
 				data = Opener.get_page(self.UserAgent)
 			except Web.Two.HTTPError as exc:
 				answer = str(exc)
-			except:
+			except Exception:
 				answer = self.AnsBase[0]
 			else:
 				data = data.decode("iso-8859-1")
@@ -790,7 +790,7 @@ class expansion_temp(expansion):
 								data = Opener.get_page(self.UserAgent)
 							except Web.Two.HTTPError as exc:
 								answer = str(exc)
-							except:
+							except Exception:
 								answer = self.AnsBase[0]
 							else:
 								data = data.decode("cp1251")
@@ -802,7 +802,7 @@ class expansion_temp(expansion):
 									No = No.replace(chr(44), chr(46))
 									try:
 										Numb = (Number*(float(Numb)/float(No)))
-									except:
+									except Exception:
 										answer = AnsBase[7]
 									else:
 										answer = "%.2f RUB" % (Numb)
@@ -822,7 +822,7 @@ class expansion_temp(expansion):
 						data = Opener.get_page(self.UserAgent)
 					except Web.Two.HTTPError as exc:
 						answer = str(exc)
-					except:
+					except Exception:
 						answer = self.AnsBase[0]
 					else:
 						data = data.decode("cp1251")
@@ -843,7 +843,7 @@ class expansion_temp(expansion):
 				data = Opener.get_page(self.UserAgent)
 			except Web.Two.HTTPError as exc:
 				answer = str(exc)
-			except:
+			except Exception:
 				answer = self.AnsBase[0]
 			else:
 				data = data.decode("cp1251")
@@ -871,7 +871,7 @@ class expansion_temp(expansion):
 			data = Opener.get_page(self.UserAgent)
 		except Web.Two.HTTPError as exc:
 			answer = str(exc)
-		except:
+		except Exception:
 			answer = self.AnsBase[0]
 		else:
 			data = data.decode("utf-8")
@@ -896,7 +896,7 @@ class expansion_temp(expansion):
 			data = Opener.get_page(self.UserAgent)
 		except Web.Two.HTTPError as exc:
 			answer = str(exc)
-		except:
+		except Exception:
 			answer = self.AnsBase[0]
 		else:
 			data = data.decode("cp1251")
@@ -923,7 +923,7 @@ class expansion_temp(expansion):
 					data = Opener.get_page(self.UserAgent)
 				except Web.Two.HTTPError as exc:
 					answer = str(exc)
-				except:
+				except Exception:
 					answer = self.AnsBase[0]
 				else:
 					data = data.decode("utf-8")
@@ -936,7 +936,7 @@ class expansion_temp(expansion):
 							data = Opener.get_page(self.UserAgent)
 						except Web.Two.HTTPError as exc:
 							answer = str(exc)
-						except:
+						except Exception:
 							answer = self.AnsBase[0]
 						else:
 							data = data.decode("utf-8")
@@ -984,7 +984,7 @@ class expansion_temp(expansion):
 							data = Opener.get_page(self.UserAgent_Moz)
 						except Web.Two.HTTPError as exc:
 							answer = str(exc)
-						except:
+						except Exception:
 							answer = self.AnsBase[0]
 						else:
 							data = data.decode("utf-8", "replace")
@@ -1006,7 +1006,7 @@ class expansion_temp(expansion):
 						data = Opener.get_page(self.UserAgent_Moz)
 					except Web.Two.HTTPError as exc:
 						answer = str(exc)
-					except:
+					except Exception:
 						answer = self.AnsBase[0]
 					else:
 						data = data.decode("utf-8", "replace")
diff --git a/expansions/basic_control/code.py b/expansions/basic_control/code.py
index 19935f1..b25d110 100644
--- a/expansions/basic_control/code.py
+++ b/expansions/basic_control/code.py
@@ -33,7 +33,7 @@ class expansion_temp(expansion):
 					if not os.path.exists(confname):
 						try:
 							os.makedirs(confname, 0755)
-						except:
+						except Exception:
 							confname = None
 					if confname:
 						codename, disp_, cPref, nick = None, None, None, DefNick
diff --git a/expansions/books/code.py b/expansions/books/code.py
index af78669..17a12bf 100644
--- a/expansions/books/code.py
+++ b/expansions/books/code.py
@@ -274,7 +274,7 @@ class expansion_temp(expansion):
 									self.importFB2(Path, source[2].strip())
 								except SelfExc as exc:
 									answer = exc[0]
-								except:
+								except Exception:
 									if AsciiSys:
 										Path = Path.decode("utf-8")
 									collectExc(self.importFB2, "library add fb2 %s" % Path)
diff --git a/expansions/bot_sends/code.py b/expansions/bot_sends/code.py
index 6612601..1bbdac2 100644
--- a/expansions/bot_sends/code.py
+++ b/expansions/bot_sends/code.py
@@ -1,8 +1,8 @@
 # coding: utf-8
 
 #  BlackSmith mark.2
-# exp_name = "bot_sends" # /code.py v.x9
-#  Id: 18~8c
+# exp_name = "bot_sends" # /code.py v.x10
+#  Id: 18~9c
 #  Code © (2010-2013) by WitcherGeralt [alkorgun@gmail.com]
 
 class expansion_temp(expansion):
@@ -11,24 +11,25 @@ class expansion_temp(expansion):
 		expansion.__init__(self, name)
 
 	def command_clear(self, stype, source, body, disp):
-		if Chats.has_key(source[1]):
-			if ChatsAttrs[source[1]]["dirt"]:
-				ChatsAttrs[source[1]]["dirt"] = None
+		conf = source[1]
+		if conf in Chats:
+			if ChatsAttrs[conf]["dirt"]:
+				ChatsAttrs[conf]["dirt"] = None
 				if stype == sBase[1]:
-					s1_backup = Chats[source[1]].state
-					s2_backup = Chats[source[1]].status
-					Chats[source[1]].change_status(sList[2], self.AnsBase[0])
-				zero = xmpp.Message(source[1], typ = sBase[1])
+					s1_backup = Chats[conf].state
+					s2_backup = Chats[conf].status
+					Chats[conf].change_status(sList[2], self.AnsBase[0])
+				zero = xmpp.Message(conf, typ = sBase[1])
 				zero.setBody("")
 				for Numb in xrange(24):
-					if not Chats.has_key(source[1]):
+					if conf not in Chats:
 						raise SelfExc("exit")
 					Sender(disp, zero); Info["omsg"].plus()
 					if (Numb != 23):
 						sleep(1.4)
 				if stype == sBase[1]:
-					Chats[source[1]].change_status(s1_backup, s2_backup)
-				ChatsAttrs[source[1]]["dirt"] = True
+					Chats[conf].change_status(s1_backup, s2_backup)
+				ChatsAttrs[conf]["dirt"] = True
 			else:
 				answer = self.AnsBase[9]
 		else:
@@ -56,13 +57,13 @@ class expansion_temp(expansion):
 		Answer(answer, stype, source, disp)
 
 	def command_more(self, stype, source, body, disp):
-		if Chats.has_key(source[1]):
-			if Chats[source[1]].more:
-				body = "[&&] %s" % (Chats[source[1]].more)
-				Chats[source[1]].more = ""
-				Message(source[1], body, disp)
-		else:
-			Answer(AnsBase[0], stype, source, disp)
+		Chat = Chats.get(source[1])
+		if not Chat:
+			return Answer(AnsBase[0], stype, source, disp)
+		if Chat.more:
+			body = "[&&] %s" % (Chat.more)
+			Chat.more = ""
+			Message(Chat.name, body, disp)
 
 	compile_chat = compile__("^[^\s'\"@<>&]+?@(?:conference|muc|conf|chat|group)\.[\w-]+?\.[\.\w-]+?$")
 
@@ -99,13 +100,12 @@ class expansion_temp(expansion):
 		Answer(answer, stype, source, disp)
 
 	def command_echo(self, stype, source, body, disp):
-		if body:
-			if ConfLimit >= len(body):
-				Message(source[1], body, disp)
-			else:
-				Message(source[1], body[:ConfLimit], disp)
+		if not body:
+			return Answer(AnsBase[1], stype, source, disp)
+		if ConfLimit >= len(body):
+			Message(source[1], body, disp)
 		else:
-			Answer(AnsBase[1], stype, source, disp)
+			Message(source[1], body[:ConfLimit], disp)
 
 	def command_invite(self, stype, source, body, disp):
 		if Chats.has_key(source[1]):
@@ -116,7 +116,7 @@ class expansion_temp(expansion):
 					source_, arg0 = None, body.split()[0]
 					if Chats[source[1]].isHere(body):
 						if Chats[source[1]].isHereTS(body):
-							Answer(self.AnsBase[6] % (body), stype, source, disp); raise ithr.ThrKill("exit")
+							return Answer(self.AnsBase[6] % (body), stype, source, disp)
 						source_ = get_source(source[1], body)
 					elif isSource(arg0):
 						source_ = arg0.lower()
diff --git a/expansions/cron/code.py b/expansions/cron/code.py
index 870816f..8396d59 100644
--- a/expansions/cron/code.py
+++ b/expansions/cron/code.py
@@ -129,7 +129,7 @@ class expansion_temp(expansion):
 									date[5] = 0
 							else:
 								date[4], date[5] = 0, 0
-						except:
+						except Exception:
 							answer = AnsBase[2]
 						else:
 							Date = (Te.pop(0) if Te else None)
@@ -141,12 +141,12 @@ class expansion_temp(expansion):
 										date[1] = int(Date.pop(0))
 										if Date:
 											date[0] = int(Date.pop(0))
-								except:
+								except Exception:
 									answer = AnsBase[2]
 						if not locals().has_key(sBase[6]):
 							try:
 								date = time.struct_time(date)
-							except:
+							except Exception:
 								answer = AnsBase[2]
 							else:
 								Time, Te = time.mktime(gt), time.mktime(date)
diff --git a/expansions/dns/code.py b/expansions/dns/code.py
index d7b618a..8a0cb6a 100644
--- a/expansions/dns/code.py
+++ b/expansions/dns/code.py
@@ -42,7 +42,7 @@ class expansion_temp(expansion):
 					sock.settimeout(6)
 					try:
 						sock.connect(server)
-					except:
+					except Exception:
 						answer = "{0}:{1} is closed.".format(host, port)
 					else:
 						answer = "{0}:{1} is opened.".format(host, port)
diff --git a/expansions/exp_control/code.py b/expansions/exp_control/code.py
index f18c21e..529c534 100644
--- a/expansions/exp_control/code.py
+++ b/expansions/exp_control/code.py
@@ -69,7 +69,7 @@ class expansion_temp(expansion):
 						if exp:
 							try:
 								exp.initialize_exp()
-							except:
+							except Exception:
 								exc = exc_info()
 								exp.dels(True)
 								answer = self.AnsBase[11] % (exp_name, "\n\t* %s: %s" % exc)
diff --git a/expansions/get_iq/code.py b/expansions/get_iq/code.py
index 529cd7e..5b906ef 100644
--- a/expansions/get_iq/code.py
+++ b/expansions/get_iq/code.py
@@ -18,7 +18,7 @@ class expansion_temp(expansion):
 					conf_nick = (source[1], instance)
 					instance, source_ = "%s/%s" % conf_nick, get_source(*conf_nick)
 				else:
-					Answer(self.AnsBase[5] % (instance), stype, source, disp); raise ithr.ThrKill("exit")
+					return Answer(self.AnsBase[5] % (instance), stype, source, disp)
 		else:
 			instance, source_ = source[0], get_source(source[1], source[2])
 		iq = xmpp.Iq(sBase[10], to = instance)
@@ -87,7 +87,7 @@ class expansion_temp(expansion):
 				if Chats[source[1]].isHereTS(instance):
 					instance = "%s/%s" % (source[1], instance)
 				else:
-					Answer(self.AnsBase[5] % (instance), stype, source, disp); raise ithr.ThrKill("exit")
+					return Answer(self.AnsBase[5] % (instance), stype, source, disp)
 		else:
 			instance = source[0]
 		iq = xmpp.Iq(sBase[10], to = instance)
@@ -104,11 +104,11 @@ class expansion_temp(expansion):
 			for node in stanza.getChildren():
 				try:
 					course, hours, minutes = self.compile_tzo.search(node.getTagData("tzo")).groups()
-				except:
+				except Exception:
 					pass
 				try:
 					date = self.compile_utc.search(node.getTagData("utc")).groups()
-				except:
+				except Exception:
 					pass
 				else:
 					date = ([int(digit) for digit in date] + [0, 0, 0])
@@ -121,7 +121,7 @@ class expansion_temp(expansion):
 						date = time.struct_time(date)
 					else:
 						date = time.gmtime()
-				except:
+				except Exception:
 					answer = self.AnsBase[6]
 				else:
 					answer = time.ctime(time.mktime(date) + hours*3600 + minutes*60)
@@ -149,7 +149,7 @@ class expansion_temp(expansion):
 				if Chats[source[1]].isHereTS(instance):
 					instance = "%s/%s" % (source[1], instance)
 				else:
-					Answer(self.AnsBase[5] % (instance), stype, source, disp); raise ithr.ThrKill("exit")
+					return Answer(self.AnsBase[5] % (instance), stype, source, disp)
 		else:
 			instance = source[0]
 		iq = xmpp.Iq(sBase[10], to = instance)
@@ -181,7 +181,7 @@ class expansion_temp(expansion):
 				if Chats[source[1]].isHereTS(instance):
 					instance = "%s/%s" % (source[1], instance)
 				else:
-					Answer(self.AnsBase[5] % (instance), stype, source, disp); raise ithr.ThrKill("exit")
+					return Answer(self.AnsBase[5] % (instance), stype, source, disp)
 		else:
 			instance = source[0]
 		iq = xmpp.Iq(sBase[10], to = instance)
diff --git a/expansions/session_stats/code.py b/expansions/session_stats/code.py
index 18aec63..20fbeba 100644
--- a/expansions/session_stats/code.py
+++ b/expansions/session_stats/code.py
@@ -23,7 +23,7 @@ class expansion_temp(expansion):
 						if stype == sBase[1]:
 							Answer(AnsBase[11], stype, source, disp)
 						Message(source[0], exc, disp)
-					except:
+					except Exception:
 						answer = self.AnsBase[20]
 				else:
 					answer = self.AnsBase[21] % (body)
diff --git a/libs.zip b/libs.zip
index c54f7f5..5853cfa 100644
--- a/libs.zip
+++ b/libs.zip