list fully supported and autopep8
authorOrakaro <nhatminh_179@hotmail.com>
Sun, 13 Jul 2014 03:58:40 +0000 (12:58 +0900)
committerOrakaro <nhatminh_179@hotmail.com>
Sun, 13 Jul 2014 03:58:40 +0000 (12:58 +0900)
rainbowstream/c_image.py
rainbowstream/config.py
rainbowstream/db.py
rainbowstream/draw.py
rainbowstream/interactive.py
rainbowstream/pure_image.py
rainbowstream/py3patch.py
rainbowstream/rainbow.py
rainbowstream/table_def.py

index 154552d2d7105c3e8f39e143400c32a7e9e62c5f..e440d405e509b66ba0e4264ddff597e310cd32ec 100644 (file)
@@ -24,7 +24,7 @@ def pixel_print(ansicolor):
     sys.stdout.write('\033[48;5;%sm \033[0m' % (ansicolor))
 
 
-def image_to_display(path,start=None,length=None):
+def image_to_display(path, start=None, length=None):
     rows, columns = os.popen('stty size', 'r').read().split()
     if not start:
         start = c['IMAGE_SHIFT']
index e75ec6727ac00bc9716eb3da9088c5095c4e0cef..b17a0e2f46734a9a91cb28c2d1d580bffcfe2de1 100644 (file)
@@ -38,7 +38,8 @@ try:
     if len(lines) > 1:
         raise Exception('More than 1 default theme')
     theme_name = lines[0].strip()
-    default_config = os.path.dirname(__file__)+'/colorset/'+theme_name+'.json'
+    default_config = os.path.dirname(
+        __file__) + '/colorset/' + theme_name + '.json'
     data = load_config(default_config)
     for d in data:
         c[d] = data[d]
index 2ab23bce0e80a371f05792886c32644a6e82e991..5bfb04081c715ad1b8f2690b1527a42987e9222a 100644 (file)
@@ -98,23 +98,3 @@ class RainbowDB():
         session = Session()
         res = session.query(Theme).all()
         return res
-
-    def list_store(self, list_id, list_name):
-        """
-        Store list id and name
-        """
-        Session = sessionmaker(bind=self.engine)
-        session = Session()
-        l = List(list_id, list_name)
-        session.add(l)
-        session.commit()
-
-    def list_name_to_id_query(self, list_name):
-        """
-        Query base of list id
-        """
-        Session = sessionmaker(bind=self.engine)
-        session = Session()
-        res = session.query(List).filter_by(list_name=list_name).all()
-        return res
-
index 1add20cd712086b73d1ffdd40f75b15e7a8244ef..7d4de2efed778bdb7722e6f0648885bffe3bceb2 100644 (file)
@@ -18,14 +18,15 @@ from .py3patch import *
 db = RainbowDB()
 g = {}
 
+
 def init_cycle():
     """
     Init the cycle
     """
     colors_shuffle = [globals()[i.encode('utf8')]
-        if not i.startswith('term_')
-        else term_color(int(i[5:]))
-        for i in c['CYCLE_COLOR']]
+                      if not i.startswith('term_')
+                      else term_color(int(i[5:]))
+                      for i in c['CYCLE_COLOR']]
     return itertools.cycle(colors_shuffle)
 g['cyc'] = init_cycle()
 g['cache'] = {}
@@ -44,9 +45,9 @@ def order_rainbow(s):
     Print a string with ordered color with each character
     """
     colors_shuffle = [globals()[i.encode('utf8')]
-        if not i.startswith('term_')
-        else term_color(int(i[5:]))
-        for i in c['CYCLE_COLOR']]
+                      if not i.startswith('term_')
+                      else term_color(int(i[5:]))
+                      for i in c['CYCLE_COLOR']]
     colored = [colors_shuffle[i % 7](s[i]) for i in xrange(len(s))]
     return ''.join(colored)
 
@@ -56,9 +57,9 @@ def random_rainbow(s):
     Print a string with random color with each character
     """
     colors_shuffle = [globals()[i.encode('utf8')]
-        if not i.startswith('term_')
-        else term_color(int(i[5:]))
-        for i in c['CYCLE_COLOR']]
+                      if not i.startswith('term_')
+                      else term_color(int(i[5:]))
+                      for i in c['CYCLE_COLOR']]
     colored = [random.choice(colors_shuffle)(i) for i in s]
     return ''.join(colored)
 
@@ -106,9 +107,8 @@ def show_calendar(month, date, rel):
     for line in rel:
         ary = line.split(' ')
         ary = lmap(lambda x: color_func(c['CAL']['today'])(x)
-            if x == today
-            else color_func(c['CAL']['days'])(x)
-            , ary)
+                   if x == today
+                   else color_func(c['CAL']['days'])(x), ary)
         printNicely(' '.join(ary))
 
 
@@ -125,9 +125,10 @@ def check_theme():
             config = os.environ.get(
                 'HOME',
                 os.environ.get('USERPROFILE',
-                '')) + os.sep + '.rainbow_config.json'
+                               '')) + os.sep + '.rainbow_config.json'
         else:
-            config = os.path.dirname(__file__) + '/colorset/'+c['theme']+'.json'
+            config = os.path.dirname(
+                __file__) + '/colorset/' + c['theme'] + '.json'
         # Load new config
         data = load_config(config)
         if data:
@@ -418,30 +419,30 @@ def print_list(group):
     """
     for g in group:
         # Format
-        name = g['name']
+        name = g['full_name']
         name = color_func(c['GROUP']['name'])(name + ' : ')
         member = str(g['member_count'])
-        member = color_func(c['GROUP']['member'])(member+' member')
+        member = color_func(c['GROUP']['member'])(member + ' member')
         subscriber = str(g['subscriber_count'])
-        subscriber = color_func(c['GROUP']['subscriber'])(subscriber+' subscriber')
+        subscriber = color_func(
+            c['GROUP']['subscriber'])(
+            subscriber +
+            ' subscriber')
         description = g['description'].strip()
         description = color_func(c['GROUP']['description'])(description)
         mode = g['mode']
-        mode = color_func(c['GROUP']['mode'])('Type: '+mode)
+        mode = color_func(c['GROUP']['mode'])('Type: ' + mode)
         created_at = g['created_at']
         date = parser.parse(created_at)
         date = date - datetime.timedelta(seconds=time.timezone)
         clock = date.strftime('%Y/%m/%d %H:%M:%S')
         clock = 'Created at ' + color_func(c['GROUP']['clock'])(clock)
 
-        # Save to db
-        db.list_store(g['id'],g['name'])
-
         # Create lines
-        line1 = ' '*2 + name + member + '  ' + subscriber
-        line2 = ' '*4 + description
-        line3 = ' '*4 + mode
-        line4 = ' '*4 + clock
+        line1 = ' ' * 2 + name + member + '  ' + subscriber
+        line2 = ' ' * 4 + description
+        line3 = ' ' * 4 + mode
+        line4 = ' ' * 4 + clock
 
         # Display
         printNicely('')
@@ -451,40 +452,3 @@ def print_list(group):
         printNicely(line4)
 
     printNicely('')
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
index 546d776f554947dfcace97a8b7fc24e78ab84ba5..62be3ec2ef5a9f9ce15eb9882f96fcb6520dfb90 100644 (file)
@@ -39,8 +39,8 @@ class RainbowCompleter(object):
                         candidates = self.options[first]
 
                     if being_completed:
-                        self.current_candidates = [ w for w in candidates
-                                                    if w.startswith(being_completed) ]
+                        self.current_candidates = [w for w in candidates
+                                                   if w.startswith(being_completed)]
                     else:
                         self.current_candidates = candidates
 
@@ -92,4 +92,3 @@ def init_interactive_shell(d):
         readline.parse_and_bind("bind ^I rl_complete")
     else:
         readline.parse_and_bind("tab: complete")
-
index 5e953e9533c7b070579477c1126188e8a053e4d0..b3139bb18563a97bb9c8af8abf719f2c0c324bc4 100644 (file)
@@ -316,7 +316,7 @@ def rgb2short(r, g, b):
     return RGB2SHORT_DICT[rgb_to_hex(m)]
 
 
-def image_to_display(path,start=None,length=None):
+def image_to_display(path, start=None, length=None):
     rows, columns = os.popen('stty size', 'r').read().split()
     if not start:
         start = IMAGE_SHIFT
index 543b9a1462a27ef2fb5cb7100058159654b32ea4..05fe7ff469cba4ce2fc2307143dfba37000e2465 100644 (file)
@@ -10,10 +10,8 @@ except:
     from io import StringIO, BytesIO
 
 # raw_input and map functiion behaviour
-if sys.version[0]=="3": 
+if sys.version[0] == "3":
     raw_input = input
-    lmap = lambda f,a: list(map(f,a))
+    lmap = lambda f, a: list(map(f, a))
 else:
-    lmap = lambda f,a: map(f,a)
-
-
+    lmap = lambda f, a: map(f, a)
index cd8be952f8ce47d85f3fb093d06f8c00bfdd0c54..3c401621c4f0ad1c60ad559971f207507d0698a3 100644 (file)
@@ -142,7 +142,7 @@ def get_decorated_name():
     g['decorated_name'] = color_func(c['DECORATED_NAME'])('[' + name + ']: ')
     g['ascii_art'] = True
 
-    files = os.listdir(os.path.dirname(__file__)+'/colorset')
+    files = os.listdir(os.path.dirname(__file__) + '/colorset')
     themes = [f.split('.')[0] for f in files if f.split('.')[-1] == 'json']
     themes += ['custom']
     g['themes'] = themes
@@ -337,7 +337,7 @@ def quote():
     printNicely(notice)
     extra = raw_input(quote)
     if extra:
-        t.statuses.update(status=quote+extra)
+        t.statuses.update(status=quote + extra)
     else:
         printNicely(light_magenta('No text added.'))
 
@@ -506,7 +506,8 @@ def urlopen():
             return
         tid = db.rainbow_to_tweet_query(g['stuff'])[0].tweet_id
         tweet = t.statuses.show(id=tid)
-        link_ary = [u for u in tweet['text'].split() if u.startswith('http://')]
+        link_ary = [
+            u for u in tweet['text'].split() if u.startswith('http://')]
         if not link_ary:
             printNicely(light_magenta('No url here @.@!'))
             return
@@ -555,7 +556,7 @@ def ls():
     printNicely('All: ' + str(len(rel)) + ' ' + d[target] + '.')
     for name in rel:
         user = '  ' + cycle_color(name)
-        user +=  color_func(c['TWEET']['nick'])(' ' + rel[name] + ' ')
+        user += color_func(c['TWEET']['nick'])(' ' + rel[name] + ' ')
         printNicely(user)
 
 
@@ -748,7 +749,7 @@ def muting():
     printNicely('All: ' + str(len(rel)) + ' people.')
     for name in rel:
         user = '  ' + cycle_color(name)
-        user +=  color_func(c['TWEET']['nick'])(' ' + rel[name] + ' ')
+        user += color_func(c['TWEET']['nick'])(' ' + rel[name] + ' ')
         printNicely(user)
 
 
@@ -800,7 +801,7 @@ def report():
 
 def show_lists(t):
     """
-    list list
+    List list
     """
     rel = t.lists.list(screen_name=g['original_name'])
     if rel:
@@ -815,14 +816,18 @@ def list_home(t):
     """
     # Get list name
     list_name = raw_input(light_magenta('Give me the list\'s name: '))
-    if not list_name:
-        printNicely(light_magenta('No list specified.'))
+    # Get list name and owner
+    try:
+        owner, slug = list_name.split('/')
+        if slug.startswith('@'):
+            slug = slug[1:]
+    except:
+        printNicely(light_magenta('Please follow "@owner/list_name" format.'))
         return
-    # Print timeline
-    l = db.list_name_to_id_query(list_name)[0]
     res = t.lists.statuses(
-        list_id = l.list_id,
-        count = c['LIST_MAX'],
+        slug=slug,
+        owner_screen_name=owner,
+        count=c['LIST_MAX'],
         include_entities=False)
     for tweet in res:
         draw(t=tweet)
@@ -835,17 +840,22 @@ def list_members(t):
     """
     # Get list name
     list_name = raw_input(light_magenta('Give me the list\'s name: '))
-    if not list_name:
-        printNicely(light_magenta('No list specified.'))
+    # Get list name and owner
+    try:
+        owner, slug = list_name.split('/')
+        if slug.startswith('@'):
+            slug = slug[1:]
+    except:
+        printNicely(light_magenta('Please follow "@owner/list_name" format.'))
         return
-    # Members
-    l = db.list_name_to_id_query(list_name)[0]
+    # Get members
     rel = {}
     next_cursor = -1
-    while next_cursor != 0 :
+    while next_cursor != 0:
         m = t.lists.members(
-            list_id = l.list_id,
-            cursor = next_cursor,
+            slug=slug,
+            owner_screen_name=owner,
+            cursor=next_cursor,
             include_entities=False)
         for u in m['users']:
             rel[u['name']] = '@' + u['screen_name']
@@ -853,7 +863,7 @@ def list_members(t):
     printNicely('All: ' + str(len(rel)) + ' members.')
     for name in rel:
         user = '  ' + cycle_color(name)
-        user +=  color_func(c['TWEET']['nick'])(' ' + rel[name] + ' ')
+        user += color_func(c['TWEET']['nick'])(' ' + rel[name] + ' ')
         printNicely(user)
 
 
@@ -863,17 +873,22 @@ def list_subscribers(t):
     """
     # Get list name
     list_name = raw_input(light_magenta('Give me the list\'s name: '))
-    if not list_name:
-        printNicely(light_magenta('No list specified.'))
+    # Get list name and owner
+    try:
+        owner, slug = list_name.split('/')
+        if slug.startswith('@'):
+            slug = slug[1:]
+    except:
+        printNicely(light_magenta('Please follow "@owner/list_name" format.'))
         return
-    # Subscribers
-    l = db.list_name_to_id_query(list_name)[0]
+    # Get subscribers
     rel = {}
     next_cursor = -1
-    while next_cursor != 0 :
+    while next_cursor != 0:
         m = t.lists.subscribers(
-            list_id = l.list_id,
-            cursor = next_cursor,
+            slug=slug,
+            owner_screen_name=owner,
+            cursor=next_cursor,
             include_entities=False)
         for u in m['users']:
             rel[u['name']] = '@' + u['screen_name']
@@ -881,29 +896,191 @@ def list_subscribers(t):
     printNicely('All: ' + str(len(rel)) + ' subscribers.')
     for name in rel:
         user = '  ' + cycle_color(name)
-        user +=  color_func(c['TWEET']['nick'])(' ' + rel[name] + ' ')
+        user += color_func(c['TWEET']['nick'])(' ' + rel[name] + ' ')
         printNicely(user)
 
 
+def list_add(t):
+    """
+    Add specific user to a list
+    """
+    # Get list name
+    list_name = raw_input(light_magenta('Give me the list\'s name: '))
+    # Get list name and owner
+    try:
+        owner, slug = list_name.split('/')
+        if slug.startswith('@'):
+            slug = slug[1:]
+    except:
+        printNicely(light_magenta('Please follow "@owner/list_name" format.'))
+        return
+    # Add
+    user_name = raw_input(light_magenta('Give me name of the newbie: '))
+    if user_name.startswith('@'):
+        user_name = user_name[1:]
+    try:
+        t.lists.members.create(
+            slug=slug,
+            owner_screen_name=owner,
+            screen_name=user_name)
+        printNicely(light_green('Added.'))
+    except:
+        printNicely(light_magenta('I\'m sorry we can not add him/her.'))
+
+
 def list_remove(t):
     """
     Remove specific user from a list
     """
     # Get list name
     list_name = raw_input(light_magenta('Give me the list\'s name: '))
-    if not list_name:
-        printNicely(light_magenta('No list specified.'))
+    # Get list name and owner
+    try:
+        owner, slug = list_name.split('/')
+        if slug.startswith('@'):
+            slug = slug[1:]
+    except:
+        printNicely(light_magenta('Please follow "@owner/list_name" format.'))
         return
     # Remove
-    l = db.list_name_to_id_query(list_name)[0]
-    user_name = raw_input(light_magenta('Give me the name of unlucky man: '))
+    user_name = raw_input(light_magenta('Give me name of the unlucky one: '))
+    if user_name.startswith('@'):
+        user_name = user_name[1:]
     try:
         t.lists.members.destroy(
-            list_id = l.list_id,
-            screen_name = user_name)
-        printNicely(light_green('Okay he\'s gone :)'))
+            slug=slug,
+            owner_screen_name=owner,
+            screen_name=user_name)
+        printNicely(light_green('Gone.'))
+    except:
+        printNicely(light_magenta('I\'m sorry we can not remove him/her.'))
+
+
+def list_subscribe(t):
+    """
+    Subscribe to a list
+    """
+    # Get list name
+    list_name = raw_input(light_magenta('Give me the list\'s name: '))
+    # Get list name and owner
+    try:
+        owner, slug = list_name.split('/')
+        if slug.startswith('@'):
+            slug = slug[1:]
+    except:
+        printNicely(light_magenta('Please follow "@owner/list_name" format.'))
+        return
+    # Subscribe
+    try:
+        t.lists.subscribers.create(
+            slug=slug,
+            owner_screen_name=owner)
+        printNicely(light_green('Done.'))
+    except:
+        printNicely(
+            light_magenta('I\'m sorry you can not subscribe to this list.'))
+
+
+def list_unsubscribe(t):
+    """
+    Unsubscribe a list
+    """
+    # Get list name
+    list_name = raw_input(light_magenta('Give me the list\'s name: '))
+    # Get list name and owner
+    try:
+        owner, slug = list_name.split('/')
+        if slug.startswith('@'):
+            slug = slug[1:]
+    except:
+        printNicely(light_magenta('Please follow "@owner/list_name" format.'))
+        return
+    # Subscribe
+    try:
+        t.lists.subscribers.destroy(
+            slug=slug,
+            owner_screen_name=owner)
+        printNicely(light_green('Done.'))
+    except:
+        printNicely(
+            light_magenta('I\'m sorry you can not unsubscribe to this list.'))
+
+
+def list_own(t):
+    """
+    List own
+    """
+    rel = []
+    next_cursor = -1
+    while next_cursor != 0:
+        res = t.lists.ownerships(
+            screen_name=g['original_name'],
+            cursor=next_cursor)
+        rel += res['lists']
+        next_cursor = res['next_cursor']
+    if rel:
+        print_list(rel)
+    else:
+        printNicely(light_magenta('You own no lists :)'))
+
+
+def list_new(t):
+    """
+    Create a new list
+    """
+    name = raw_input(light_magenta('New list\'s name: '))
+    mode = raw_input(light_magenta('New list\'s mode (public/private): '))
+    description = raw_input(light_magenta('New list\'s description: '))
+    try:
+        t.lists.create(
+            name=name,
+            mode=mode,
+            description=description)
+        printNicely(light_green(name + ' list is created.'))
+    except:
+        printNicely(red('Oops something is wrong with Twitter :('))
+
+
+def list_update(t):
+    """
+    Update a list
+    """
+    slug = raw_input(light_magenta('Your list that you want to update: '))
+    name = raw_input(light_magenta('Update name (leave blank to unchange): '))
+    mode = raw_input(light_magenta('Update mode (public/private): '))
+    description = raw_input(light_magenta('Update description: '))
+    try:
+        if name:
+            t.lists.update(
+                slug='-'.join(slug.split()),
+                owner_screen_name=g['original_name'],
+                name=name,
+                mode=mode,
+                description=description)
+        else:
+            t.lists.update(
+                slug=slug,
+                owner_screen_name=g['original_name'],
+                mode=mode,
+                description=description)
+        printNicely(light_green(slug + ' list is updated.'))
+    except Exception as e:
+        print e
+        printNicely(red('Oops something is wrong with Twitter :('))
+
+
+def list_delete(t):
+    """
+    Delete a list
+    """
+    slug = raw_input(light_magenta('Your list that you want to update: '))
+    try:
+        t.lists.destroy(
+            slug='-'.join(slug.split()),
+            owner_screen_name=g['original_name'])
+        printNicely(light_green(slug + ' list is deleted.'))
     except:
-        printNicely(light_magenta('I\'m sorry we can not remove him.'))
+        printNicely(red('Oops something is wrong with Twitter :('))
 
 
 def list():
@@ -917,17 +1094,24 @@ def list():
     except:
         show_lists(t)
         return
-
-    # Sub function
+    # Sub-function
     action_ary = {
         'home': list_home,
         'all_mem': list_members,
         'all_sub': list_subscribers,
+        'add': list_add,
         'rm': list_remove,
+        'sub': list_subscribe,
+        'unsub': list_unsubscribe,
+        'own': list_own,
+        'new': list_new,
+        'update': list_update,
+        'del': list_delete,
     }
     try:
         return action_ary[g['list_action']](t)
-    except:
+    except Exception as e:
+        print e
         printNicely(red('Sorry I can\'t understand.'))
 
 
@@ -956,22 +1140,23 @@ def theme():
                 custom_path = os.environ.get(
                     'HOME',
                     os.environ.get('USERPROFILE',
-                        '')) + os.sep + '.rainbow_config.json'
+                                   '')) + os.sep + '.rainbow_config.json'
                 if not os.path.exists(custom_path):
-                    line += light_magenta(' (create your own config file at ~/.rainbow_config.json)')
+                    line += light_magenta(
+                        ' (create your own config file at ~/.rainbow_config.json)')
                 else:
                     line += light_magenta(' (loaded)')
             else:
                 line += light_magenta(theme)
-            if c['theme'] == theme :
-                line = ' '*2 + light_yellow('* ') + line
+            if c['theme'] == theme:
+                line = ' ' * 2 + light_yellow('* ') + line
             else:
-                line = ' '*4 + line
+                line = ' ' * 4 + line
             printNicely(line)
     elif g['stuff'] == 'current_as_default':
         # Set default
         path = os.path.dirname(__file__) + '/colorset/init'
-        f = open(path,'w')
+        f = open(path, 'w')
         f.write(c['theme'])
         f.close()
         os.system('chmod 777 ' + path)
@@ -981,10 +1166,11 @@ def theme():
         try:
             # Load new config
             if g['stuff'] != 'custom':
-                new_config = os.path.dirname(__file__) + '/colorset/' + g['stuff'] + '.json'
+                new_config = os.path.dirname(
+                    __file__) + '/colorset/' + g['stuff'] + '.json'
             else:
                 new_config = os.environ.get(
-                    'HOME',os.environ.get(
+                    'HOME', os.environ.get(
                         'USERPROFILE',
                         '')) + os.sep + '.rainbow_config.json'
             new_config = load_config(new_config)
@@ -1136,9 +1322,24 @@ def help_list():
         ' will show list\'s all members.\n'
     usage += s * 2 + light_green('list all_sub') + \
         ' will show list\'s all subscribers.\n'
+    usage += s * 2 + light_green('list add') + \
+        ' will add specific person to a list owned by you.' + \
+        ' You will be asked for list\'s name and person\'s name.\n'
     usage += s * 2 + light_green('list rm') + \
         ' will remove specific person from a list owned by you.' + \
         ' You will be asked for list\'s name and person\'s name.\n'
+    usage += s * 2 + light_green('list sub') + \
+        ' will subscribe you to a specific list.\n'
+    usage += s * 2 + light_green('list unsub') + \
+        ' will unsubscribe you from a specific list.\n'
+    usage += s * 2 + light_green('list own') + \
+        ' will show all list owned by you.\n'
+    usage += s * 2 + light_green('list new') + \
+        ' will create a new list.\n'
+    usage += s * 2 + light_green('list update') + \
+        ' will update a list owned by you.\n'
+    usage += s * 2 + light_green('list del') + \
+        ' will delete a list owned by you.\n'
     printNicely(usage)
 
 
@@ -1224,12 +1425,12 @@ def help():
 
     # Show help
     d = {
-        'discover' : help_discover,
-        'tweets' : help_tweets,
-        'messages' : help_messages,
-        'friends_and_followers' : help_friends_and_followers,
-        'list' : help_list,
-        'stream' : help_stream,
+        'discover': help_discover,
+        'tweets': help_tweets,
+        'messages': help_messages,
+        'friends_and_followers': help_friends_and_followers,
+        'list': help_list,
+        'stream': help_stream,
     }
     if g['stuff']:
         d[g['stuff'].strip()]()
@@ -1351,10 +1552,29 @@ def listen():
             ['@'],  # block
             ['@'],  # unblock
             ['@'],  # report
-            ['home','all_mem','all_sub','rm'],  # list
+            [
+                'home',
+                'all_mem',
+                'all_sub',
+                'add',
+                'rm',
+                'sub',
+                'unsub',
+                'own',
+                'new',
+                'update',
+                'del'
+            ],  # list
             [],  # cal
             g['themes'] + ['current_as_default'],  # theme
-            ['discover','tweets','messages','friends_and_followers','list','stream'],  # help
+            [
+                'discover',
+                'tweets',
+                'messages',
+                'friends_and_followers',
+                'list',
+                'stream'
+            ],  # help
             [],  # clear
             [],  # quit
         ]
@@ -1472,7 +1692,7 @@ def fly():
     p = Process(
         target=stream,
         args=(
-        c['USER_DOMAIN'],
+            c['USER_DOMAIN'],
             args,
             g['original_name']))
     p.start()
index 28bbfc9000fa8658f7bd39285e30bd53e4760702..fda3948dfbe0ad06d8bf77e08c1d296fbca93862 100644 (file)
@@ -38,18 +38,5 @@ class Theme(Base):
         self.theme_name = theme_name
 
 
-class List(Base):
-
-    __tablename__ = "list"
-
-    list_rid = Column(Integer, primary_key=True)
-    list_id = Column(Integer)
-    list_name = Column(String(50))
-
-    def __init__(self, list_id, list_name):
-        self.list_id = list_id
-        self.list_name = list_name
-
-
 def init_db():
     Base.metadata.create_all(engine)