From 1c4db4a10e8604fc6bbda83af6b8b88771b254f1 Mon Sep 17 00:00:00 2001
From: Bill Dengler <codeofdusk@gmail.com>
Date: Sat, 17 Jun 2017 01:14:09 +0000
Subject: [PATCH] Strings are unicode now.

---
 src/controller/mainController.py           | 4 ++--
 src/controller/messages.py                 | 4 ++--
 src/twitter/compose.py                     | 2 +-
 src/url_shortener/shorteners/tinyarrows.py | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/controller/mainController.py b/src/controller/mainController.py
index 6837fc39..bba98926 100644
--- a/src/controller/mainController.py
+++ b/src/controller/mainController.py
@@ -947,8 +947,8 @@ class Controller(object):
     x = tweet["coordinates"]["coordinates"][0]
     y = tweet["coordinates"]["coordinates"][1]
     address = geocoder.reverse_geocode(y, x)
-    if event == None: output.speak(address[0].__str__().decode("utf-8"))
-    else: self.view.show_address(address[0].__str__().decode("utf-8"))
+    if event == None: output.speak(address[0].__str__())
+    else: self.view.show_address(address[0].__str__())
    else:
     output.speak(_(u"There are no coordinates in this tweet"))
   except GeocoderError:
diff --git a/src/controller/messages.py b/src/controller/messages.py
index 02740c9e..5bc4cf7b 100644
--- a/src/controller/messages.py
+++ b/src/controller/messages.py
@@ -232,7 +232,7 @@ class viewTweet(basicTweet):
    rt_count = str(tweet["retweet_count"])
    favs_count = str(tweet["favorite_count"])
    # Gets the client from where this tweet was made.
-   source = str(re.sub(r"(?s)<.*?>", "", tweet["source"].encode("utf-8")))
+   source = str(re.sub(r"(?s)<.*?>", "", str(tweet["source"])))
    if text == "":
     if "message" in tweet:
      value = "message"
@@ -254,7 +254,7 @@ class viewTweet(basicTweet):
     for z in tweet["retweeted_status"]["extended_entities"]["media"]:
      if "ext_alt_text" in z and z["ext_alt_text"] != None:
       image_description.append(z["ext_alt_text"])
-   self.message = message.viewTweet(text, rt_count, favs_count, source.decode("utf-8"))
+   self.message = message.viewTweet(text, rt_count, favs_count, source)
    self.message.set_title(len(text))
    [self.message.set_image_description(i) for i in image_description]
   else:
diff --git a/src/twitter/compose.py b/src/twitter/compose.py
index b8d4b3f0..83c380e1 100644
--- a/src/twitter/compose.py
+++ b/src/twitter/compose.py
@@ -29,7 +29,7 @@ def StripChars(s):
  Else, a unicode string will be returned."""
   if match.group(1).startswith('#'): return chr(int(match.group(1)[1:]))
   replacement = html.entities.entitydefs.get(match.group(1), "&%s;" % match.group(1))
-  return replacement.decode('iso-8859-1')
+  return replacement
  return str(entity_re.sub(matchFunc, s))
 
 chars = "abcdefghijklmnopqrstuvwxyz"
diff --git a/src/url_shortener/shorteners/tinyarrows.py b/src/url_shortener/shorteners/tinyarrows.py
index 57645204..7fc30207 100644
--- a/src/url_shortener/shorteners/tinyarrows.py
+++ b/src/url_shortener/shorteners/tinyarrows.py
@@ -13,7 +13,7 @@ class TinyArrowsShortener (URLShortener):
  def _shorten (self, url):
   answer = url
   answer = urllib.request.urlopen("http://tinyarro.ws/api-create.php?utfpure=1&url=%s" % urllib.parse.quote(url)).read()
-  return answer.decode('UTF-8')
+  return answer
 
  def created_url(self, url):
   return False