userinfo - remove _ from keys/has/get/set/delete

diff --git a/modules/trivia.py b/modules/trivia.py
index 3e79db35ed96434d3b4da8a0a941d3be28b5da5b..c55d19acf36e0e6773c7891be165c4fb11601aa7 100644 (file)
--- a/modules/trivia.py
+++ b/modules/trivia.py
@@ -65,7 +65,7 @@ def pts(num):
                return 0
 
 def country(num, default="??"):
-       return lib.mod('userinfo')._get(person(num), 'country', default=default).upper()
+       return lib.mod('userinfo').get(person(num), 'country', default=default).upper()
 
 class MyTimer(timerbase):
        def __init__(self, *args, **kwargs):

diff --git a/modules/userinfo.py b/modules/userinfo.py
index e0df42a827f6f5612968349ee3b0435b629284ac..65580f8690fa671b9dfaa08a85387e39a4f44d7e 100644 (file)
--- a/modules/userinfo.py
+++ b/modules/userinfo.py
@@ -53,15 +53,15 @@ def _getauth(thing):
                                return "#"+parent.user(thing).auth
        return None
 
-def _keys(user):
+def keys(user):
        return list(set(db.get(_getauth(user), {}).keys() + db.get(str(user).lower(), {}).keys())) #list-to-set-to-list to remove duplicates
-def _has(user, key):
+def has(user, key):
        key = key.lower()
        return (
                key in db.get(_getauth(user), {}) or
                key in db.get(str(user).lower(), {})
        )
-def _get(user, key, default=None):
+def get(user, key, default=None):
        key = key.lower()
        return (
                db.get(_getauth(user), {}). #try to get the auth
@@ -70,12 +70,12 @@ def _get(user, key, default=None):
                                get(key, #and try to get the info-key from that
                                default #otherwise throw out whatever default
        )))
-def _set(user, key, value):
+def set(user, key, value):
        key = key.lower()
        if _getauth(user) is not None:
                db.setdefault(_getauth(user), {})[key] = value #use auth if we can
        db.setdefault(str(user).lower(), {})[key] = value #but set nick too
-def _del(user, key):
+def delete(user, key):
        key = key.lower()
        auth = _getauth(user)
        if auth is not None and auth in db and key in db[auth]:
@@ -96,7 +96,7 @@ def getitems(bot, user, chan, realtarget, *args):
        else:
                target = user
 
-       bot.msg(replyto, "%(user)s: %(target)s has the following info items: %(items)s" % {'user':user,'target':target,'items':(', '.join(_keys(target)))})
+       bot.msg(replyto, "%(user)s: %(target)s has the following info items: %(items)s" % {'user':user,'target':target,'items':(', '.join(keys(target)))})
 
 @lib.hook(needchan=False, wantchan=True)
 @lib.help("[<target>] <item>", "gets an info item about someone", "<target> may be a nick, or an auth in format '#auth'", "it defaults to yourself")
@@ -112,7 +112,7 @@ def getinfo(bot, user, chan, realtarget, *args):
                target = user
                item = args[0]
 
-       value = _get(target, item, None)
+       value = get(target, item, None)
        if value is None:
                bot.msg(replyto, "%(user)s: %(item)s on %(target)s is not set." % {'user':user,'item':item,'target':target})
        else:
@@ -122,7 +122,7 @@ def getinfo(bot, user, chan, realtarget, *args):
 @lib.help("<item> <value>", "sets an info item about you")
 @lib.argsGE(2)
 def setinfo(bot, user, chan, realtarget, *args):
-       _set(user, args[0], ' '.join(args[1:]))
+       set(user, args[0], ' '.join(args[1:]))
        savedb()
        bot.msg(user, "Done.")
 
@@ -130,7 +130,7 @@ def setinfo(bot, user, chan, realtarget, *args):
 @lib.help("<item>", "deletes an info item about you")
 @lib.argsEQ(1)
 def delinfo(bot, user, chan, realtarget, *args):
-       _del(user, args[0])
+       delete(user, args[0])
        savedb()
        bot.msg(user, "Done.")
 
@@ -138,7 +138,7 @@ def delinfo(bot, user, chan, realtarget, *args):
 @lib.help("<target> <item> <value>", "sets an info item about someone else", "<target> may be a nick, or an auth in format '#auth'")
 @lib.argsGE(3)
 def osetinfo(bot, user, chan, realtarget, *args):
-       _set(args[0], args[1], ' '.join(args[2:]))
+       set(args[0], args[1], ' '.join(args[2:]))
        savedb()
        bot.msg(user, "Done.")
 
@@ -146,6 +146,6 @@ def osetinfo(bot, user, chan, realtarget, *args):
 @lib.help("<target> <item>", "deletes an info item about someone else", "<target> may be a nick, or an auth in format '#auth'")
 @lib.argsEQ(2)
 def odelinfo(bot, user, chan, realtarget, *args):
-       _del(args[0], args[1])
+       delete(args[0], args[1])
        savedb()
        bot.msg(user, "Done.")

diff --git a/modules/weather.py b/modules/weather.py
index 8194f5ba03aedfc1196ad18d5a597efec646a476..5f016c0ecb32494e88fc084bc7b2cb3a3411a8df 100644 (file)
--- a/modules/weather.py
+++ b/modules/weather.py
@@ -27,7 +27,7 @@ if sys.version_info.major < 3:
 else:
        from urllib.request import urlopen
 
-def location(person, default=None): return lib.mod('userinfo')._get(person, 'location', default=None)
+def location(person, default=None): return lib.mod('userinfo').get(person, 'location', default=None)
 
 def _dayofweek(dayname):
        return ['mon','tue','wed','thu','fri','sat','sun'].index(dayname.lower())