From 4ea9399a46d506702cb0ce28dd0c56de8b28fa0d Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 16:24:59 -0400 Subject: [PATCH] test --- sopel_modules/SpiceBot/Database.py | 8 ++++---- .../sayings/moviequotes.json | 0 .../sayings/oaf.json | 0 .../sayings/paygrade.json | 0 .../sayings/phish.json | 0 .../sayings/relationship.json | 0 .../sayings/solution.json | 0 .../sayings/techsupport.json | 0 .../sayings/til.json | 0 .../sayings/uselessfacts.json | 0 .../sayings/webmd.json | 0 .../sayings/wife.json | 0 .../sayings/world.json | 0 13 files changed, 4 insertions(+), 4 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/moviequotes.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/oaf.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/paygrade.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/phish.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/relationship.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/solution.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/techsupport.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/til.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/uselessfacts.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/webmd.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/wife.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/world.json (100%) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index 0754286..d0906fb 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, Unicode +from sqlalchemy import create_engine, Column, String, ForeignKey, Integer, Text 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(Unicode()) + value = Column(Text()) 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(Unicode()) + value = Column(Text()) 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(Unicode()) + value = Column(Text()) class SpiceDB(object): diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/moviequotes.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/moviequotes.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/moviequotes.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/moviequotes.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/oaf.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/oaf.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/oaf.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/oaf.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/paygrade.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/paygrade.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/paygrade.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/paygrade.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/phish.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/phish.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/phish.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/phish.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/relationship.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/relationship.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/relationship.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/relationship.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/solution.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/solution.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/solution.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/solution.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/techsupport.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/techsupport.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/techsupport.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/techsupport.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/til.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/til.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/til.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/til.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/uselessfacts.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/uselessfacts.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/uselessfacts.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/uselessfacts.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/webmd.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/webmd.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/webmd.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/webmd.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/wife.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/wife.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/wife.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/wife.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/world.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/world.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/world.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/world.json