From abdec998a820d29ca92a9114e0811ca11b74e0cc Mon Sep 17 00:00:00 2001 From: mehdiHadji Date: Thu, 5 Sep 2019 10:33:16 +0000 Subject: [PATCH 1/3] style (add python3 compatibility in shorten_word) --- deepmoji/filter_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deepmoji/filter_utils.py b/deepmoji/filter_utils.py index c82ffee..afc8986 100644 --- a/deepmoji/filter_utils.py +++ b/deepmoji/filter_utils.py @@ -140,7 +140,7 @@ def shorten_word(word): # only shorten ASCII words try: - word.decode('ascii') + word.encode().decode('ascii') except (UnicodeDecodeError, UnicodeEncodeError) as e: return word From 8d09eacdc4091f21be2fcdb8b4e842ad0b1ff81d Mon Sep 17 00:00:00 2001 From: mehdiHadji Date: Thu, 5 Sep 2019 10:48:34 +0000 Subject: [PATCH 2/3] style (unicode to str. in python3 is a unicode string) --- deepmoji/word_generator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deepmoji/word_generator.py b/deepmoji/word_generator.py index f3e7ce3..ff0f439 100644 --- a/deepmoji/word_generator.py +++ b/deepmoji/word_generator.py @@ -64,7 +64,7 @@ def get_words(self, sentence): that is not allowed. """ - if not isinstance(sentence, unicode): + if not isinstance(sentence, str): raise ValueError("All sentences should be Unicode-encoded!") sentence = sentence.strip().lower() From 4ccda55ceb6b2fa57637db6c3c2d4d346a02ed4b Mon Sep 17 00:00:00 2001 From: mehdiHadji Date: Thu, 5 Sep 2019 10:55:32 +0000 Subject: [PATCH 3/3] style (add python3 compatibility in check_ascii) --- deepmoji/word_generator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deepmoji/word_generator.py b/deepmoji/word_generator.py index ff0f439..2937151 100644 --- a/deepmoji/word_generator.py +++ b/deepmoji/word_generator.py @@ -96,7 +96,7 @@ def check_ascii(self, word): """ Returns whether a word is ASCII """ try: - word.decode('ascii') + word.encode().decode('ascii') return True except (UnicodeDecodeError, UnicodeEncodeError): return False