From f75930c6e0b0ec505732b758d414162a8bebdece Mon Sep 17 00:00:00 2001 From: Vu Nhat Minh Date: Thu, 3 Jul 2014 16:25:58 +0900 Subject: [PATCH] fix sqlalchemy bug --- rainbowstream/config.py | 3 --- rainbowstream/db.py | 1 - rainbowstream/rainbow.py | 1 + 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/rainbowstream/config.py b/rainbowstream/config.py index 183bfe3..a5e542d 100644 --- a/rainbowstream/config.py +++ b/rainbowstream/config.py @@ -3,9 +3,6 @@ import re import os import os.path -from .db import * - -db = RainbowDB() # Regular expression for comments comment_re = re.compile( diff --git a/rainbowstream/db.py b/rainbowstream/db.py index 775c856..5bfb040 100644 --- a/rainbowstream/db.py +++ b/rainbowstream/db.py @@ -1,6 +1,5 @@ import os from sqlalchemy import create_engine -from sqlalchemy import update from sqlalchemy.orm import sessionmaker from .table_def import * diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py index ed3d07f..51ab7dd 100644 --- a/rainbowstream/rainbow.py +++ b/rainbowstream/rainbow.py @@ -139,6 +139,7 @@ def get_decorated_name(): files = os.listdir('rainbowstream/colorset') themes = [f.split('.')[0] for f in files if f.split('.')[-1] == 'json'] + themes += ['custom'] g['themes'] = themes db.theme_store(c['theme']) -- 2.25.1