Skip to content

python2 to python3 migration #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mehdiHadji wants to merge 3 commits into
base: master
Choose a base branch
from
Open

python2 to python3 migration #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abdec99
style (add python3 compatibility in shorten_word)
mehdiHadji Sep 5, 2019
8d09eac
style (unicode to str. <str> in python3 is a unicode string)
mehdiHadji Sep 5, 2019
4ccda55
style (add python3 compatibility in check_ascii)
mehdiHadji Sep 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deepmoji/filter_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions deepmoji/word_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -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
Expand Down