X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/827ec8f0367a9482714aeddc6f7e7eef56dee417..adbee2daa637e03213cda1f13f263d1a49e994a2:/modlib.py

diff --git a/modlib.py b/modlib.py
index ff63a07..e5c8d81 100644
--- a/modlib.py
+++ b/modlib.py
@@ -2,11 +2,20 @@
 # module helper functions, see modules/modtest.py for usage
 # This file is released into the public domain; see http://unlicense.org/
 
+import sys
+
+if sys.version_info.major < 3:
+	stringbase = basestring
+else:
+	stringbase = str
+
 class error(object):
+	"""Used to return an error to the bot core."""
 	def __init__(self, desc):
 		self.errormsg = desc
 	def __nonzero__(self):
 		return False #object will test to False
+	__bool__ = __nonzero__ #py3 compat
 	def __repr__(self):
 		return '<modlib.error %r>' % self.errormsg
 	def __str__(self):
@@ -54,12 +63,12 @@ class modlib(object):
 		# non-empty string (or anything else True-y): specified success
 		#"specified" values will be printed. unspecified values will result in "OK" or "failed"
 		self.parent = parent
-		for cmd, func in self.hooks.iteritems():
+		for cmd, func in self.hooks.items():
 			self.parent.hook(cmd, func)
 			self.parent.hook("%s.%s" % (self.name, cmd), func)
-		for num, func in self.numhooks.iteritems():
+		for num, func in self.numhooks.items():
 			self.parent.hooknum(num, func)
-		for chan, func in self.chanhooks.iteritems():
+		for chan, func in self.chanhooks.items():
 			self.parent.hookchan(chan, func)
 
 		for func, args, kwargs in self.helps:
@@ -69,12 +78,12 @@ class modlib(object):
 				pass
 		return True
 	def modstop(self, parent):
-		for cmd, func in self.hooks.iteritems():
+		for cmd, func in self.hooks.items():
 			parent.unhook(cmd, func)
 			parent.unhook("%s.%s" % (self.name, cmd), func)
-		for num, func in self.numhooks.iteritems():
+		for num, func in self.numhooks.items():
 			parent.unhooknum(num, func)
-		for chan, func in self.chanhooks.iteritems():
+		for chan, func in self.chanhooks.items():
 			parent.unhookchan(chan, func)
 
 		for func, args, kwargs in self.helps:
@@ -107,7 +116,7 @@ class modlib(object):
 			cmd = _cmd #...and restore it
 			if cmd is None:
 				cmd = func.__name__ # default to function name
-			if isinstance(cmd, basestring):
+			if isinstance(cmd, stringbase):
 				cmd = (cmd,)
 
 			func.needchan = needchan
@@ -172,6 +181,6 @@ class modlib(object):
 					self.mod('help').reghelp(func, *args, **kwargs)
 				except:
 					pass
-			self.helps.append((func,args,kwargs))
+			self.helps.append((func, args, kwargs))
 			return func
 		return realhook