From aa452ee997fb704cf144fe56e1abd59b4f639ddb Mon Sep 17 00:00:00 2001 From: Orakaro Date: Wed, 3 Sep 2014 01:25:02 +0900 Subject: [PATCH] only use PREFIX as a string in raw_input --- docs/conf.py | 4 ++-- rainbowstream/colorset/config | 4 +--- rainbowstream/rainbow.py | 7 ++++--- setup.py | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 21df9bb..647e44c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -48,9 +48,9 @@ copyright = u'2014, Vu Nhat Minh' # built documents. # # The short X.Y version. -version = '0.9.5' +version = '0.9.6' # The full version, including alpha/beta/rc tags. -release = '0.9.5' +release = '0.9.6' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/rainbowstream/colorset/config b/rainbowstream/colorset/config index 66c4c5d..14046fe 100644 --- a/rainbowstream/colorset/config +++ b/rainbowstream/colorset/config @@ -57,9 +57,7 @@ }, "MESSAGE": { "CLOCK_FORMAT" : "%Y/%m/%d %H:%M:%S", - "DISPLAY" : "\n #sender_name #sender_nick #to #recipient_name #recipient_nick :\n #clock message_id:#id\n #message", - "THREAD_META_LEFT" : "[id:#id] #clock", - "THREAD_META_RIGHT" : "#clock [id:#id]" + "DISPLAY" : "\n #sender_name #sender_nick #to #recipient_name #recipient_nick :\n #clock message_id:#id\n #message" } } } diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py index 08cdcb7..bfca0fd 100644 --- a/rainbowstream/rainbow.py +++ b/rainbowstream/rainbow.py @@ -1723,6 +1723,7 @@ def listen(): try: # raw_input if g['prefix']: + # Only use PREFIX as a string with raw_input line = raw_input(g['decorated_name'](g['PREFIX'])) else: line = raw_input() @@ -1807,7 +1808,7 @@ def stream(domain, args, name='Rainbow Stream'): light_green("h stream") + \ light_magenta(" for more details.") printNicely(guide) - sys.stdout.write(g['decorated_name'](g['PREFIX'])) + sys.stdout.write(g['decorated_name'](c['PREFIX'])) sys.stdout.flush() StreamLock.release() break @@ -1835,10 +1836,10 @@ def stream(domain, args, name='Rainbow Stream'): # the 1st character of that word if current_buffer and g['cmd'] != current_buffer: sys.stdout.write( - g['decorated_name'](g['PREFIX']) + str2u(current_buffer)) + g['decorated_name'](c['PREFIX']) + str2u(current_buffer)) sys.stdout.flush() elif not c['HIDE_PROMPT']: - sys.stdout.write(g['decorated_name'](g['PREFIX'])) + sys.stdout.write(g['decorated_name'](c['PREFIX'])) sys.stdout.flush() elif tweet.get('direct_message'): # Check the semaphore pause and lock (stream process only) diff --git a/setup.py b/setup.py index 43343b3..0cbc272 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ import os import os.path # Bumped version -version = '0.9.5' +version = '0.9.6' # Require install_requires = [ -- 2.25.1