diff options
-rwxr-xr-x | calendar-cli.py | 10 | ||||
-rw-r--r-- | setup.py | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/calendar-cli.py b/calendar-cli.py index 5c30498..cb46912 100755 --- a/calendar-cli.py +++ b/calendar-cli.py @@ -35,7 +35,15 @@ import sys import re import urllib3 from getpass import getpass -from caldav.lib.python_utilities import to_normal_str +from six import PY3 + +def to_normal_str(text): + if PY3 and text and not isinstance(text, str): + text = text.decode('utf-8') + elif not PY3 and text and not isinstance(text, str): + text = text.encode('utf-8') + return text + ## ref https://github.com/tobixen/calendar-cli/issues/33, python3-compatibility try: @@ -42,7 +42,8 @@ setup( 'icalendar', 'caldav>=0.5.0', 'pytz', - 'tzlocal' + 'tzlocal', + 'six' ], **metadata ) |