diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index d0906fb..0754286 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -12,7 +12,7 @@ from sopel.db import SopelDB, _deserialize from .Config import config as botconfig from sqlalchemy.engine.url import URL -from sqlalchemy import create_engine, Column, String, ForeignKey, Integer, Text +from sqlalchemy import create_engine, Column, String, ForeignKey, Integer, Unicode from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.exc import SQLAlchemyError @@ -50,7 +50,7 @@ class NickValues(BASE): nick_id = Column(Integer, ForeignKey('spice_nick_ids.nick_id'), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text()) + value = Column(Unicode()) class ChannelValues(BASE): @@ -61,7 +61,7 @@ class ChannelValues(BASE): channel = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text()) + value = Column(Unicode()) class PluginValues(BASE): @@ -72,7 +72,7 @@ class PluginValues(BASE): plugin = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text()) + value = Column(Unicode()) class SpiceDB(object): diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/advertisments.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/advertisments.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/advertisments.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/advertisments.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/ass.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/ass.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/ass.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/ass.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bacon.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bacon.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bacon.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bacon.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bitch.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bitch.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bitch.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bitch.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bull.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bull.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bull.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bull.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/comcast.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/comcast.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/comcast.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/comcast.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/confucius.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/confucius.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/confucius.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/confucius.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/dj.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/dj.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/dj.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/dj.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fix.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fix.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fix.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fix.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fortune_cookie.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fortune_cookie.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fortune_cookie.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fortune_cookie.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/guess.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/guess.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/guess.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/guess.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/maybe.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/maybe.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/maybe.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/maybe.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/me.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/me.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/me.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/me.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/no.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/no.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/no.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/no.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/yes.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/yes.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/yes.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/yes.json