trivival refactoring

diff --git a/docs/conf.py b/docs/conf.py
index bc742227dd9a5515527526e6c38f86b1d891ff80..985bdd58c06cd93b12c21a63279981a66f2737dc 100644 (file)
--- 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 = '1.1.7'
+version = '1.1.8'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.7'
+release = '1.1.8'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/index.rst b/docs/index.rst
index 76167ed8051e228907120de6ed6ab3954095d79d..db6cc910e74e9201fee9a81157cc9616c310fdc1 100644 (file)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -13,6 +13,10 @@ favorite … and much more fun directly from terminal.
 This package is built on the top of `Python Twitter Tool`_ and `Twitter API`_,\r
 can run on Python 2.7.x and 3.x .\r
 \r
+Home page : http://www.rainbowstream.org/\r
+\r
+Source code : https://github.com/DTVD/rainbowstream\r
+\r
 Install\r
 -------\r
 \r

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index 2d1be923b83181ae88199ab3a53dd46f0dadfc40..206f84d1aa694ef4e95e8a6ad8491eb3ab2daa67 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -27,7 +27,7 @@ from .interactive import *
 from .c_image import *
 from .py3patch import *
 from .emoji import *
-from .util import printTwitterErrors
+from .util import *
 
 # Global values
 g = {}
@@ -2071,8 +2071,8 @@ def stream(domain, args, name='Rainbow Stream'):
     except TwitterHTTPError as e:
         printNicely('')
         printNicely(
-            magenta("We have maximum connection problem with twitter'stream API right now :("))
-        printTwitterErrors(e)
+            magenta("We have connection problem with twitter'stream API right now :("))
+        detail_twitter_error(e)
 
 
 def fly():
@@ -2088,9 +2088,8 @@ def fly():
     except TwitterHTTPError as e:
         printNicely('')
         printNicely(
-            magenta("We have connection problem with twitter'stream API right now :("))
-        printTwitterErrors(e)
-        printNicely(magenta("Let's try again later."))
+            magenta("We have connection problem with twitter'REST API right now :("))
+        detail_twitter_error(e)
         save_history()
         sys.exit()
     # Proxy connection problem

diff --git a/rainbowstream/util.py b/rainbowstream/util.py
index 03eaf903b91a4ee375a98c98e7379ada48cabce5..a3cd1272ad495d8fc8e2b8ece0bae06bdd9f09ec 100644 (file)
--- a/rainbowstream/util.py
+++ b/rainbowstream/util.py
@@ -4,14 +4,15 @@ from twitter.util import printNicely
 from .colors import *
 
 
-def printTwitterErrors(twitterException):
+def detail_twitter_error(twitterException):
     """
     Display Twitter Errors nicely
     """
     try:
         loadedJson = json.loads(twitterException.response_data)
         for m in loadedJson.get('errors', dict()):
-            printNicely(
-                magenta("Error " + str(m.get('code')) + ": " + m.get('message')))
+            info = "Error " + str(m.get('code')) + ": " + m.get('message')
+            printNicely(yellow(info))
     except ValueError:
-        printNicely(magenta("Error: " + twitterException.response_data))
+        info = "Error: " + twitterException.response_data
+        printNicely(yellow(info))

diff --git a/setup.py b/setup.py
index 2bbc458f0c0a26b92a5cde1bf80cee9b510b7351..85973a73a200999fa8e54999c95109ca5fad3ffd 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ import os
 import os.path
 
 # Bumped version
-version = '1.1.7'
+version = '1.1.8'
 
 # Require
 install_requires = [