autopep8

diff --git a/rainbowstream/colors.py b/rainbowstream/colors.py
index 4a214d0bb061f1bedbe9fc4046852ca341801ed8..5d49096a861727044b9e617268f9e6023d745499 100644 (file)
--- a/rainbowstream/colors.py
+++ b/rainbowstream/colors.py
@@ -1,28 +1,37 @@
-import random, itertools
+import random
+import itertools

 from functools import wraps
 from termcolor import *
 from pyfiglet import figlet_format
 from functools import wraps
 from termcolor import *
 from pyfiglet import figlet_format

+from functools import reduce

 
 

-grey    = lambda x: colored(x, 'grey', attrs=['bold'])
-red     = lambda x: colored(x, 'red', attrs=['bold'])
-green   = lambda x: colored(x, 'green', attrs=['bold'])
-yellow  = lambda x: colored(x, 'yellow', attrs=['bold'])
-blue    = lambda x: colored(x, 'blue', attrs=['bold'])
+grey = lambda x: colored(x, 'grey', attrs=['bold'])
+red = lambda x: colored(x, 'red', attrs=['bold'])
+green = lambda x: colored(x, 'green', attrs=['bold'])
+yellow = lambda x: colored(x, 'yellow', attrs=['bold'])
+blue = lambda x: colored(x, 'blue', attrs=['bold'])

 magenta = lambda x: colored(x, 'magenta', attrs=['bold'])
 magenta = lambda x: colored(x, 'magenta', attrs=['bold'])

-cyan    = lambda x: colored(x, 'cyan', attrs=['bold'])
-white   = lambda x: colored(x, 'white', attrs=['bold'])
+cyan = lambda x: colored(x, 'cyan', attrs=['bold'])
+white = lambda x: colored(x, 'white', attrs=['bold'])

 
 

-on_grey    = lambda x: colored(x, 'white', 'on_grey', attrs=['bold'])
-on_red     = lambda x: colored(x, 'white', 'on_red', attrs=['bold'])
-on_green   = lambda x: colored(x, 'white', 'on_green', attrs=['bold'])
-on_yellow  = lambda x: colored(x, 'white', 'on_yellow', attrs=['bold'])
-on_blue    = lambda x: colored(x, 'white', 'on_blue', attrs=['bold'])
+on_grey = lambda x: colored(x, 'white', 'on_grey', attrs=['bold'])
+on_red = lambda x: colored(x, 'white', 'on_red', attrs=['bold'])
+on_green = lambda x: colored(x, 'white', 'on_green', attrs=['bold'])
+on_yellow = lambda x: colored(x, 'white', 'on_yellow', attrs=['bold'])
+on_blue = lambda x: colored(x, 'white', 'on_blue', attrs=['bold'])

 on_magenta = lambda x: colored(x, 'white', 'on_magenta', attrs=['bold'])
 on_magenta = lambda x: colored(x, 'white', 'on_magenta', attrs=['bold'])

-on_cyan    = lambda x: colored(x, 'white', 'on_cyan', attrs=['bold'])
-on_white   = lambda x: colored(x, 'white', 'on_white', attrs=['bold'])
+on_cyan = lambda x: colored(x, 'white', 'on_cyan', attrs=['bold'])
+on_white = lambda x: colored(x, 'white', 'on_white', attrs=['bold'])

 
 colors_shuffle = [grey, red, green, yellow, blue, magenta, cyan]
 
 colors_shuffle = [grey, red, green, yellow, blue, magenta, cyan]

-background_shuffle = [on_grey, on_red, on_green, on_yellow, on_blue, on_magenta, on_cyan]
+background_shuffle = [
+    on_grey,
+    on_red,
+    on_green,
+    on_yellow,
+    on_blue,
+    on_magenta,
+    on_cyan]

 cyc = itertools.cycle(colors_shuffle[1:])
 
 
 cyc = itertools.cycle(colors_shuffle[1:])
 
 


@@ -30,21 +39,24 @@ def order_rainbow(s):
     """
     Print a string with ordered color with each character
     """
     """
     Print a string with ordered color with each character
     """

-    c = [colors_shuffle[i%7](s[i]) for i in xrange(len(s))]
-    return reduce(lambda x,y: x+y, c)
+    c = [colors_shuffle[i % 7](s[i]) for i in xrange(len(s))]
+    return reduce(lambda x, y: x + y, c)
+

 
 def random_rainbow(s):
     """
     Print a string with random color with each character
     """
     c = [random.choice(colors_shuffle)(i) for i in s]
 
 def random_rainbow(s):
     """
     Print a string with random color with each character
     """
     c = [random.choice(colors_shuffle)(i) for i in s]

-    return reduce(lambda x,y: x+y, c)
+    return reduce(lambda x, y: x + y, c)
+

 
 def Memoize(func):
     """
     Memoize decorator
     """
     cache = {}
 
 def Memoize(func):
     """
     Memoize decorator
     """
     cache = {}

+

     @wraps(func)
     def wrapper(*args):
         if args not in cache:
     @wraps(func)
     def wrapper(*args):
         if args not in cache:


@@ -52,6 +64,7 @@ def Memoize(func):
         return cache[args]
     return wrapper
 
         return cache[args]
     return wrapper
 

+

 @Memoize
 def cycle_color(s):
     """
 @Memoize
 def cycle_color(s):
     """


@@ -59,13 +72,13 @@ def cycle_color(s):
     """
     return next(cyc)(s)
 
     """
     return next(cyc)(s)
 

+

 def ascii_art():
     """
     Draw the Ascii Art
     """
     fi = figlet_format('Rainbow Stream', font='doom')
     print('\n'.join(
 def ascii_art():
     """
     Draw the Ascii Art
     """
     fi = figlet_format('Rainbow Stream', font='doom')
     print('\n'.join(

-            [next(cyc)(i) for i in fi.split('\n')]
-        )
+        [next(cyc)(i) for i in fi.split('\n')]
+    )

     )
     )

-

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index 4d6f5c86ff832658064e04cb0446b4548bb40f39..2a070e35814a8d517e943e058e6c463868958737 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -4,7 +4,9 @@ Colorful user's timeline stream
 
 from __future__ import print_function
 
 
 from __future__ import print_function
 

-import os, os.path, argparse
+import os
+import os.path
+import argparse

 
 from twitter.stream import TwitterStream, Timeout, HeartbeatTimeout, Hangup
 from twitter.oauth import OAuth, read_token_file
 
 from twitter.stream import TwitterStream, Timeout, HeartbeatTimeout, Hangup
 from twitter.oauth import OAuth, read_token_file


@@ -12,8 +14,9 @@ from twitter.oauth_dance import oauth_dance
 from twitter.util import printNicely
 from dateutil import parser
 
 from twitter.util import printNicely
 from dateutil import parser
 

-from colors import *
-from config import *
+from .colors import *
+from .config import *
+

 
 def draw(t):
     """
 
 def draw(t):
     """


@@ -29,21 +32,21 @@ def draw(t):
 
     # Format info
     user = cycle_color(name + ' ' + '@' + screen_name + ' ')
 
     # Format info
     user = cycle_color(name + ' ' + '@' + screen_name + ' ')

-    clock = grey('['+ time + ']')
+    clock = grey('[' + time + ']')

     tweet = text.split()
     tweet = text.split()

-    tweet = map(lambda x: grey(x) if x=='RT' else x, tweet)
-    tweet = map(lambda x: cycle_color(x) if x[0]=='@' else x, tweet)
-    tweet = map(lambda x: cyan(x) if x[0:7]=='http://' else x, tweet)
+    tweet = map(lambda x: grey(x) if x == 'RT' else x, tweet)
+    tweet = map(lambda x: cycle_color(x) if x[0] == '@' else x, tweet)
+    tweet = map(lambda x: cyan(x) if x[0:7] == 'http://' else x, tweet)

     tweet = ' '.join(tweet)
 
     # Draw rainbow
     line1 = u"{u:>{uw}}:".format(
     tweet = ' '.join(tweet)
 
     # Draw rainbow
     line1 = u"{u:>{uw}}:".format(

-        u = user,
-        uw = len(user) + 2,
+        u=user,
+        uw=len(user) + 2,

     )
     line2 = u"{c:>{cw}}".format(
     )
     line2 = u"{c:>{cw}}".format(

-        c = clock,
-        cw = len(clock) + 2,
+        c=clock,
+        cw=len(clock) + 2,

     )
     line3 = '  ' + tweet
     line4 = '\n'
     )
     line3 = '  ' + tweet
     line4 = '\n'


@@ -58,10 +61,24 @@ def parse_arguments():
 
     parser = argparse.ArgumentParser(description=__doc__ or "")
 
 
     parser = argparse.ArgumentParser(description=__doc__ or "")
 

-    parser.add_argument('-to', '--timeout', help='Timeout for the stream (seconds).')
-    parser.add_argument('-ht', '--heartbeat-timeout', help='Set heartbeat timeout.', default=90)
-    parser.add_argument('-nb', '--no-block', action='store_true', help='Set stream to non-blocking.')
-    parser.add_argument('-tt', '--track-keywords', help='Search the stream for specific text.')
+    parser.add_argument(
+        '-to',
+        '--timeout',
+        help='Timeout for the stream (seconds).')
+    parser.add_argument(
+        '-ht',
+        '--heartbeat-timeout',
+        help='Set heartbeat timeout.',
+        default=90)
+    parser.add_argument(
+        '-nb',
+        '--no-block',
+        action='store_true',
+        help='Set stream to non-blocking.')
+    parser.add_argument(
+        '-tt',
+        '--track-keywords',
+        help='Search the stream for specific text.')

     return parser.parse_args()
 
 
     return parser.parse_args()
 
 


@@ -72,14 +89,22 @@ def stream():
     ascii_art()
 
     # When using rainbow stream you must authorize.
     ascii_art()
 
     # When using rainbow stream you must authorize.

-    twitter_credential = os.environ.get('HOME', os.environ.get('USERPROFILE', '')) + os.sep + '.rainbow_oauth'
+    twitter_credential = os.environ.get(
+        'HOME',
+        os.environ.get(
+            'USERPROFILE',
+            '')) + os.sep + '.rainbow_oauth'

     if not os.path.exists(twitter_credential):
         oauth_dance("Rainbow Stream",
                     CONSUMER_KEY,
                     CONSUMER_SECRET,
                     twitter_credential)
     oauth_token, oauth_token_secret = read_token_file(twitter_credential)
     if not os.path.exists(twitter_credential):
         oauth_dance("Rainbow Stream",
                     CONSUMER_KEY,
                     CONSUMER_SECRET,
                     twitter_credential)
     oauth_token, oauth_token_secret = read_token_file(twitter_credential)

-    auth = OAuth(oauth_token, oauth_token_secret, CONSUMER_KEY, CONSUMER_SECRET)
+    auth = OAuth(
+        oauth_token,
+        oauth_token_secret,
+        CONSUMER_KEY,
+        CONSUMER_SECRET)

 
     # These arguments are optional:
     stream_args = dict(
 
     # These arguments are optional:
     stream_args = dict(


@@ -93,7 +118,10 @@ def stream():
         query_args['track'] = args.track_keywords
 
     # Get stream
         query_args['track'] = args.track_keywords
 
     # Get stream

-    stream = TwitterStream(auth=auth, domain='userstream.twitter.com', **stream_args)
+    stream = TwitterStream(
+        auth=auth,
+        domain='userstream.twitter.com',
+        **stream_args)

     tweet_iter = stream.user(**query_args)
 
     # Iterate over the sample stream.
     tweet_iter = stream.user(**query_args)
 
     # Iterate over the sample stream.


@@ -107,7 +135,7 @@ def stream():
         elif tweet is Hangup:
             printNicely("-- Hangup --")
         elif tweet.get('text'):
         elif tweet is Hangup:
             printNicely("-- Hangup --")
         elif tweet.get('text'):

-            line1, line2, line3, line4 = draw(t = tweet)
+            line1, line2, line3, line4 = draw(t=tweet)

             printNicely(line1)
             printNicely(line2)
             printNicely(line3)
             printNicely(line1)
             printNicely(line2)
             printNicely(line3)