icalcli 1.1.4__tar.gz → 1.1.6__tar.gz

{icalcli-1.1.4 → icalcli-1.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: icalcli
-Version: 1.1.4
+Version: 1.1.6
 Summary: Icalendar Calendar Command Line Interface
 Author: Jayanth R. Varma
 Maintainer-email: "Jayanth R. Varma" <jrvarma@gmail.com>

{icalcli-1.1.4 → icalcli-1.1.6}/icalcli/__init__.py

@@ -1,5 +1,5 @@
 __program__ = 'icalcli'
-__version__ = 'v1.0.4'
+__version__ = 'v1.1.6'
 __author__ = 'Jayanth Varma (modified gcalcli by Eric Davis et al.)'
 from icalcli.icalcli import IcalendarInterface  # noqa F401
 try:

{icalcli-1.1.4 → icalcli-1.1.6}/icalcli/etesync_backend/etebase_interface.py

@@ -33,6 +33,18 @@ from icalendar import Calendar
 # No exception handling is done. That is left to the calling program.
 
 
+def decode_if_bytes(string_or_bytes):
+    # Version 7 of iCalendar made a breaking change
+    # The return type of text properties was changed from bytes to string
+    # To work with both old and new versions of iCalendar and to guard
+    # against any future change in the return value of calendar.to_ical()
+    # which still returns bytes, we apply decode only after confirming that
+    # the value is bytes
+    if isinstance(string_or_bytes, bytes):
+        return string_or_bytes.decode()
+    return string_or_bytes
+
+
 class EtebaseInterface (EtebaseCRUD):
     def __init__(self, user, server_url, password, calendar_uid,
                  cache_file=None, silent=True):
@@ -63,7 +75,7 @@ class EtebaseInterface (EtebaseCRUD):
         event : event to be added (iCalendar object)
         """
         ics = self.event_to_ics(event, vtimezone)
-        uid = event.decoded('uid').decode()
+        uid = decode_if_bytes(event.decoded('uid'))
         EtebaseCRUD.create_event(self, ics, uid)
 
     def update_event(self, event, vtimezone=None):
@@ -73,7 +85,7 @@ class EtebaseInterface (EtebaseCRUD):
         ----------
         event : event to be added (iCalendar object)
         """
-        uid = event.decoded('uid').decode()
+        uid = decode_if_bytes(event.decoded('uid'))
         ics = self.event_to_ics(event, vtimezone)
         EtebaseCRUD.update_event(self, ics, uid)
 

{icalcli-1.1.4 → icalcli-1.1.6}/icalcli/etesync_backend/etesync_interface.py

@@ -6,7 +6,6 @@
 from icalcli.etesync_backend.etesync_crud import EtesyncCRUD
 from icalendar import Calendar
 
-
 # The EtesyncInterface class is basically a wrapper around the
 # EtesyncCRUD class from which it is derived
 # The CRUD operations (Create, Retrieve, Update and Delete)
@@ -37,6 +36,18 @@ from icalendar import Calendar
 # No exception handling is done. That is left to the calling program.
 
 
+def decode_if_bytes(string_or_bytes):
+    # Version 7 of iCalendar made a breaking change
+    # The return type of text properties was changed from bytes to string
+    # To work with both old and new versions of iCalendar and to guard
+    # against any future change in the return value of calendar.to_ical()
+    # which still returns bytes, we apply decode only after confirming that
+    # the value is bytes
+    if isinstance(string_or_bytes, bytes):
+        return string_or_bytes.decode()
+    return string_or_bytes
+
+
 class EtesyncInterface (EtesyncCRUD):
     def __init__(self, email, userPassword, remoteUrl, uid, authToken,
                  cipher_key=None, silent=True):
@@ -76,7 +87,7 @@ class EtesyncInterface (EtesyncCRUD):
         ----------
         event : event to be added (iCalendar object)
         """
-        uid = event.decoded('uid').decode()
+        uid = decode_if_bytes(event.decoded('uid'))
         ics = self.event_to_ics(event, vtimezone)
         EtesyncCRUD.update_event(self, ics, uid)
 
@@ -91,7 +102,7 @@ class EtesyncInterface (EtesyncCRUD):
         cal.add_component(event)
         if vtimezone:
             cal.add_component(vtimezone)
-        ics = cal.to_ical().decode()
+        ics = decode_if_bytes(cal.to_ical())
         return ics
 
     def sync(self, vtimezone=None):
@@ -99,4 +110,3 @@ class EtesyncInterface (EtesyncCRUD):
         """
         EtesyncCRUD.sync(self)
         self.all_events()
-

{icalcli-1.1.4 → icalcli-1.1.6}/icalcli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: icalcli
-Version: 1.1.4
+Version: 1.1.6
 Summary: Icalendar Calendar Command Line Interface
 Author: Jayanth R. Varma
 Maintainer-email: "Jayanth R. Varma" <jrvarma@gmail.com>

{icalcli-1.1.4 → icalcli-1.1.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "icalcli"
-version = "1.1.4"
+version = "1.1.6"
 authors = [
         {name = "Jayanth R. Varma"}
 ]