Minor change added to make it more like how it was before

[rainbowstream.git] / rainbowstream / util.py

diff --git a/rainbowstream/util.py b/rainbowstream/util.py
index 8a33711ceb7efc98a954a48e4337e02b848bd474..d69cf88991898dada09d45c887c9eedaa673cabf 100644 (file)
--- a/rainbowstream/util.py
+++ b/rainbowstream/util.py
@@ -9,36 +9,41 @@ def detail_twitter_error(twitterException):
     """
     Display Twitter Errors nicely
     """
+    data = twitterException.response_data
     try:
-        # twitterException.response_data can be byte string on Python 3
-        # or nornal dict on Python 2
-        loadedJson = json.loads(twitterException.response_data.decode('utf8'))
-        for m in loadedJson.get('errors', dict()):
-            info = "Error " + str(m.get('code')) + ": " + m.get('message')
-            printNicely(yellow(info))
-    except:
-        info = "Error: " + twitterException.response_data.decode('utf8')
-        printNicely(yellow(info))
+        for m in data.get('errors', dict()):
+            printNicely(yellow(m.get('message')))
+    except: 
+        printNicely(yellow(data))
 
 
-def format_prefix(listname = '', keyword = ''):
+def format_prefix(listname='', keyword=''):
     """
     Format the custom prefix
     """
     formattedPrefix = c['PREFIX']
     owner = '@' + c['original_name']
     place = ''
+    # Public stream
     if keyword:
-        place = '/public'
-        keyword = '#' + keyword
-
-    if listname:
+        formattedPrefix = ''.join(formattedPrefix.split('#owner'))
+        formattedPrefix = ''.join(formattedPrefix.split('#place'))
+        formattedPrefix = ''.join(formattedPrefix.split('#me'))
+    # List stream
+    elif listname:
+        formattedPrefix = ''.join(formattedPrefix.split('#keyword'))
+        formattedPrefix = ''.join(formattedPrefix.split('#me'))
         owner, place = listname.split('/')
-        place = "/" + place
-
-    formattedPrefix = formattedPrefix.replace("#owner", owner)
-    formattedPrefix = formattedPrefix.replace("#place", place)
-    formattedPrefix = formattedPrefix.replace("#keyword", keyword)
-    formattedPrefix = formattedPrefix.replace("#me", '@' + c['original_name'])
+        place = '/' + place
+    # Personal stream
+    else:
+        formattedPrefix = ''.join(formattedPrefix.split('#keyword'))
+        formattedPrefix = ''.join(formattedPrefix.split('#owner'))
+        formattedPrefix = ''.join(formattedPrefix.split('#place'))
+
+    formattedPrefix = formattedPrefix.replace('#owner', owner)
+    formattedPrefix = formattedPrefix.replace('#place', place)
+    formattedPrefix = formattedPrefix.replace('#keyword', keyword)
+    formattedPrefix = formattedPrefix.replace('#me', '@' + c['original_name'])
 
     return formattedPrefix