add support for python 3

diff --git a/.gitignore b/.gitignore
index 68d0a4395e9d6ff6be721765e9fc98944dbe0161..ec01fee9eac9f17a056dc757c6475dc1267f57a9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -62,7 +62,7 @@ docs/_build/
 *.swo*
 
 # Virtualenv
-/venv/*
+/venv*
 
 # History completer
 completer.hist

diff --git a/rainbowstream/c_image.py b/rainbowstream/c_image.py
index 7b334894530f801bfb4c99023e95595e0acb29bf..79226232f5a785314743e423c7fab46c58414a61 100644 (file)
--- a/rainbowstream/c_image.py
+++ b/rainbowstream/c_image.py
@@ -41,12 +41,12 @@ def image_to_display(path,start=None,length=None):
     height = min(height, c['IMAGE_MAX_HEIGHT'])
 
     for y in xrange(height):
-        print ' ' * start,
+        sys.stdout.write(' ' * start)
         for x in xrange(width):
             p = i.getpixel((x, y))
             r, g, b = p[:3]
             pixel_print(rgb2short(r, g, b))
-        print ''
+        sys.stdout.write('\n')
 
 if __name__ == '__main__':
     image_to_display(sys.argv[1])

diff --git a/rainbowstream/draw.py b/rainbowstream/draw.py
index 57e7867497265c4aea9d7ffea54c3ffbac7e045f..fa276f498da96dc7e925e24522dddd611a4e9c17 100644 (file)
--- a/rainbowstream/draw.py
+++ b/rainbowstream/draw.py
@@ -7,13 +7,13 @@ import time
 from twitter.util import printNicely
 from functools import wraps
 from pyfiglet import figlet_format
-from functools import reduce
-from StringIO import StringIO
 from dateutil import parser
 from .c_image import *
 from .colors import *
 from .config import *
 from .db import *
+from .py3patch import *
+
 
 db = RainbowDB()
 g = {}
@@ -48,7 +48,7 @@ def order_rainbow(s):
         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 reduce(lambda x, y: x + y, colored)
+    return ''.join(colored)
 
 
 def random_rainbow(s):
@@ -60,7 +60,7 @@ def random_rainbow(s):
         else term_color(int(i[5:]))
         for i in c['CYCLE_COLOR']]
     colored = [random.choice(colors_shuffle)(i) for i in s]
-    return reduce(lambda x, y: x + y, colored)
+    return ''.join(colored)
 
 
 def Memoize(func):
@@ -105,7 +105,7 @@ def show_calendar(month, date, rel):
     printNicely(date)
     for line in rel:
         ary = line.split(' ')
-        ary = map(lambda x: color_func(c['CAL']['today'])(x)
+        ary = lmap(lambda x: color_func(c['CAL']['today'])(x)
             if x == today
             else color_func(c['CAL']['days'])(x)
             , ary)
@@ -141,10 +141,9 @@ def color_func(func_name):
     """
     Call color function base on name
     """
-    pure = func_name.encode('utf8')
-    if pure.startswith('term_') and pure[5:].isdigit():
-        return term_color(int(pure[5:]))
-    return globals()[pure]
+    if func_name.startswith('term_') and func_name[5:].isdigit():
+        return term_color(int(func_name[5:]))
+    return globals()[func_name]
 
 
 def draw(t, iot=False, keyword=None, fil=[], ig=[]):
@@ -210,25 +209,25 @@ def draw(t, iot=False, keyword=None, fil=[], ig=[]):
     # Replace url
     if expanded_url:
         for index in range(len(expanded_url)):
-            tweet = map(
+            tweet = lmap(
                 lambda x: expanded_url[index] if x == url[index] else x,
                 tweet)
     # Highlight RT
-    tweet = map(
+    tweet = lmap(
         lambda x: color_func(
             c['TWEET']['rt'])(x) if x == 'RT' else x,
         tweet)
     # Highlight screen_name
-    tweet = map(lambda x: cycle_color(x) if x[0] == '@' else x, tweet)
+    tweet = lmap(lambda x: cycle_color(x) if x[0] == '@' else x, tweet)
     # Highlight link
-    tweet = map(
+    tweet = lmap(
         lambda x: color_func(
             c['TWEET']['link'])(x) if x[
             0:4] == 'http' else x,
         tweet)
     # Highlight search keyword
     if keyword:
-        tweet = map(
+        tweet = lmap(
             lambda x: color_func(c['TWEET']['keyword'])(x) if
             ''.join(c for c in x if c.isalnum()).lower() == keyword.lower()
             else x,
@@ -296,7 +295,7 @@ def print_message(m):
         '[' + clock + ']') + color_func(
             c['MESSAGE']['id'])(
                 ' [message_id=' + str(rid) + '] ')
-    text = ''.join(map(lambda x: x + '  ' if x == '\n' else x, text))
+    text = ''.join(lmap(lambda x: x + '  ' if x == '\n' else x, text))
 
     line1 = u"{u:>{uw}}:".format(
         u=user,
@@ -350,7 +349,7 @@ def show_profile(u, iot=False):
     profile_image_raw_url = 'Profile photo: ' + \
         color_func(c['PROFILE']['profile_image_url'])(profile_image_url)
     description = ''.join(
-        map(lambda x: x + ' ' * 4 if x == '\n' else x, description))
+        lmap(lambda x: x + ' ' * 4 if x == '\n' else x, description))
     description = color_func(c['PROFILE']['description'])(description)
     location = 'Location : ' + color_func(c['PROFILE']['location'])(location)
     url = 'URL : ' + (color_func(c['PROFILE']['url'])(url) if url else '')

diff --git a/rainbowstream/interactive.py b/rainbowstream/interactive.py
index afbbc0549a6712acc0d9433660e020a3ad1b5d30..546d776f554947dfcace97a8b7fc24e78ab84ba5 100644 (file)
--- a/rainbowstream/interactive.py
+++ b/rainbowstream/interactive.py
@@ -27,11 +27,11 @@ class RainbowCompleter(object):
             words = origline.split()
 
             if not words:
-                self.current_candidates = sorted(self.options.keys())
+                self.current_candidates = sorted([c for c in self.options])
             else:
                 try:
                     if begin == 0:
-                        candidates = self.options.keys()
+                        candidates = [c for c in self.options]
                     elif words[-1] in self.options[words[0]]:
                         candidates = []
                     else:

diff --git a/rainbowstream/py3patch.py b/rainbowstream/py3patch.py
new file mode 100644 (file)
index 0000000..e1eec6e
--- /dev/null
+++ b/rainbowstream/py3patch.py
@@ -0,0 +1,19 @@
+"""
+  Python 3 supports
+"""
+import sys
+
+# StringIO module
+try:
+    from StringIO import StringIO
+except:
+    from io import StringIO
+
+# raw_input and map functiion behaviour
+if sys.version[0]=="3": 
+    raw_input = input
+    lmap = lambda f,a: list(map(f,a))
+else:
+    lmap = lambda f,a: map(f,a)
+
+

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index 43466ec61213f3c4a1138ef53b75d2823939bb85..af674eb3d6b91a4c2d8ec35fe8306c0d081c92b6 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -17,7 +17,6 @@ from twitter.api import *
 from twitter.oauth import OAuth, read_token_file
 from twitter.oauth_dance import oauth_dance
 from twitter.util import printNicely
-from StringIO import StringIO
 
 from .draw import *
 from .colors import *
@@ -26,6 +25,8 @@ from .consumer import *
 from .interactive import *
 from .db import *
 from .c_image import *
+from .py3patch import *
+
 
 g = {}
 db = RainbowDB()
@@ -1151,8 +1152,7 @@ def listen():
         try:
             g['stuff'] = ' '.join(line.split()[1:])
             process(cmd)()
-        except Exception,e :
-            print e
+        except Exception:
             printNicely(red('OMG something is wrong with Twitter right now.'))
         # Not redisplay prefix
         if cmd in ['switch', 't', 'rt', 'rep']:

diff --git a/setup.py b/setup.py
index af31317ca3735016e4ff4fe94ddaafaba3d67ee4..c19cc83aedd0f1a325a419de9d6151036d063542 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,6 @@ install_requires = [
     "requests",
     "pyfiglet",
     "SQLAlchemy",
-    "pysqlite",
     "twitter",
     "Pillow",
 ]