X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/c62b669baa86f0beda32518252381d89d127f246..c3ff1486929923f394c219e6999df301a5a5bf04:/modules/userinfo.py

diff --git a/modules/userinfo.py b/modules/userinfo.py
index ab09365..9604b8b 100644
--- a/modules/userinfo.py
+++ b/modules/userinfo.py
@@ -25,7 +25,13 @@ def modstop(*args, **kwargs):
 	return lib.modstop(*args, **kwargs)
 
 # module code
-import json, __builtin__
+import json, sys
+if sys.version_info.major >= 3:
+	import builtins as __builtin__
+	stringbase = str
+else:
+	import __builtin__
+	stringbase = basestring
 
 #setup
 def gotParent():
@@ -44,7 +50,7 @@ def _getauth(thing):
 	if isinstance(thing, parent.User):
 		if thing.auth is not None:
 			return "#"+thing.auth
-	elif isinstance(thing, basestring):
+	elif isinstance(thing, stringbase):
 		if thing.startswith("#"):
 			return thing
 		else:
@@ -54,7 +60,7 @@ def _getauth(thing):
 	return None
 
 def keys(user):
-	return list(__builtin__.set(db.get(_getauth(user), {}).keys() + db.get(str(user).lower(), {}).keys())) #list-to-set-to-list to remove duplicates
+	return list(__builtin__.set(list(db.get(_getauth(user), {}).keys()) + list(db.get(str(user).lower(), {}).keys()))) #list-to-set-to-list to remove duplicates
 def has(user, key):
 	key = key.lower()
 	return (