If I rename botvars to database, it looks less awful :D

Author: dmptrluke

cloudbot/bot.py

@@ -17,7 +17,7 @@
 from cloudbot.reloader import PluginReloader
 from cloudbot.plugin import PluginManager
 from cloudbot.event import Event, CommandEvent, RegexEvent, EventType
-from cloudbot.util import botvars, formatting
+from cloudbot.util import database, formatting
 from cloudbot.clients.irc import IrcClient
 
 logger = logging.getLogger("cloudbot")
@@ -93,9 +93,9 @@ def __init__(self, loop=asyncio.get_event_loop()):
         self.db_base = declarative_base(metadata=self.db_metadata, bind=self.db_engine)
 
         # set botvars so plugins can access when loading
-        botvars.metadata = self.db_metadata
-        botvars.base = self.db_base
-        botvars.user_agent = self.user_agent
+        database.metadata = self.db_metadata
+        database.base = self.db_base
+        database.user_agent = self.user_agent
 
         logger.debug("Database system initialised.")
 

cloudbot/plugin.py

@@ -9,7 +9,7 @@
 import sqlalchemy
 
 from cloudbot.event import Event
-from cloudbot.util import botvars
+from cloudbot.util import database
 
 logger = logging.getLogger("cloudbot")
 
@@ -52,7 +52,7 @@ def find_tables(code):
     """
     tables = []
     for name, obj in code.__dict__.items():
-        if isinstance(obj, sqlalchemy.Table) and obj.metadata == botvars.metadata:
+        if isinstance(obj, sqlalchemy.Table) and obj.metadata == database.metadata:
             # if it's a Table, and it's using our metadata, append it to the list
             tables.append(obj)
 

cloudbot/util/botvars.py cloudbot/util/database.pycloudbot/util/botvars.py renamed to cloudbot/util/database.py

@@ -1,4 +1,4 @@
-from cloudbot.util.botvars import metadata
+from cloudbot.util.database import metadata
 
 
 def test_botvars():

cloudbot/util/test/test_botvars.py

@@ -6,7 +6,7 @@
 import requests
 
 from cloudbot import hook
-from cloudbot.util import botvars, colors, web
+from cloudbot.util import database, colors, web
 
 
 re_lineends = re.compile(r'[\r\n]*')
@@ -15,7 +15,7 @@
 
 table = Table(
     "mem",
-    botvars.metadata,
+    database.metadata,
     Column("word", String(25), primary_key=True),
     Column("data", String(500)),
     Column("nick", String(25))

plugins/factoids.py

@@ -4,12 +4,12 @@
 from sqlalchemy import Table, Column, UniqueConstraint, PrimaryKeyConstraint, String, Boolean
 
 from cloudbot import hook
-from cloudbot.util import botvars
+from cloudbot.util import database
 
 
 table = Table(
     "ignored",
-    botvars.metadata,
+    database.metadata,
     Column("connection", String(25)),
     Column("channel", String(25)),
     Column("mask", String(250)),

plugins/ignore.py

@@ -6,13 +6,13 @@
 from sqlalchemy import Table, Column, PrimaryKeyConstraint, String
 
 from cloudbot import hook
-from cloudbot.util import timeformat, web, botvars
+from cloudbot.util import timeformat, web, database
 
 api_url = "http://ws.audioscrobbler.com/2.0/?format=json"
 
 table = Table(
     "lastfm",
-    botvars.metadata,
+    database.metadata,
     Column('nick', String(25)),
     Column('acc', String(25)),
     PrimaryKeyConstraint('nick')

plugins/lastfm.py

@@ -5,11 +5,11 @@
 from sqlalchemy.sql import select
 
 from cloudbot import hook
-from cloudbot.util import botvars
+from cloudbot.util import database
 
 table = Table(
     'notes',
-    botvars.metadata,
+    database.metadata,
     Column('note_id', Integer),
     Column('connection', String(25)),
     Column('user', String(25)),

plugins/notes.py

@@ -1,7 +1,7 @@
 from sqlalchemy import Column, Integer, String, Sequence
 
 from cloudbot import hook
-from cloudbot.util.botvars import base
+from cloudbot.util.database import base
 
 
 class User(base):

plugins/orm_thingy.py

@@ -3,7 +3,7 @@
 import time
 
 from cloudbot import hook
-from cloudbot.util import botvars
+from cloudbot.util import database
 
 from sqlalchemy import select
 from sqlalchemy import Table, Column, String, PrimaryKeyConstraint
@@ -13,7 +13,7 @@
 
 qtable = Table(
     'quote',
-    botvars.metadata,
+    database.metadata,
     Column('chan', String(25)),
     Column('nick', String(25)),
     Column('add_nick', String(25)),