Fix HTMLParser.unescape method remove from python 3.9

python-twitter-tools · Dec 2, 2020 · a5b6d22 · a5b6d22
1 parent 0e8c29c
commit a5b6d22
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/twitter/cmdline.py b/twitter/cmdline.py
@@ -125,7 +125,12 @@
     'force-ansi': False,
 }
 
-gHtmlParser = HTMLParser.HTMLParser()
+try:
+    unescape = HTMLParser.HTMLParser().unescape
+except AttributeError:
+    import html
+    unescape = html.unescape
+
 hashtagRe = re.compile(r'(?P<hashtag>#\S+)')
 profileRe = re.compile(r'(?P<profile>\@\S+)')
 ansiFormatter = ansi.AnsiCmd(False)
@@ -207,7 +212,7 @@ def reRepl(m):
 
 
 def replaceInStatus(status):
-    txt = gHtmlParser.unescape(status)
+    txt = unescape(status)
     txt = re.sub(hashtagRe, reRepl, txt)
     txt = re.sub(profileRe, reRepl, txt)
     return txt
@@ -226,7 +231,7 @@ def __call__(self, status, options):
         return ("%s@%s %s" % (
             get_time_string(status, options),
             status['user']['screen_name'],
-            gHtmlParser.unescape(correctRTStatus(status))))
+            unescape(correctRTStatus(status))))
 
 
 class AnsiStatusFormatter(object):
@@ -248,12 +253,12 @@ def __call__(self, status, options):
             status['user']['screen_name'],
             status['user']['location'],
             status['created_at'],
-            gHtmlParser.unescape(correctRTStatus(status))))
+            unescape(correctRTStatus(status))))
 
 
 class JSONStatusFormatter(object):
     def __call__(self, status, options):
-        status['text'] = gHtmlParser.unescape(status['text'])
+        status['text'] = unescape(status['text'])
         return json.dumps(status)