From 8f81542852e8a613da00b4d4f418b15fcebe7c4a Mon Sep 17 00:00:00 2001
From: David Barnett <david@mumind.me>
Date: Sat, 24 Aug 2024 17:26:52 -0600
Subject: [PATCH] Fix import and agendaupdate to handle encoding errors more
 gracefully

Configures file arguments with errors='replace' so that if they
encounter characters they can't encode/decode they'll just replace them
with a replacement marker such as '?' instead of raising an exception.

Fixes #387 (probably)
---
 ChangeLog             |  4 +++-
 gcalcli/argparsers.py | 10 ++++++++--
 tests/test_gcalcli.py |  6 +-----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2bcdd98..a9eeae2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 v4.4.0
-  * Fix lots of bugs by switching from deprecaetd oauth2client to
+  * Fix lots of bugs by switching from deprecated oauth2client to
     google_auth_oauthlib
+  * Handle encoding/decoding errors more gracefully by replacing with
+    placeholder chars instead of blowing up
   * Fix `--lineart` option failing with unicode errors
   * `quick` command now prompts for which calendar to use when ambiguous
   * Fix --nodeclined option failing on events with aliased email
diff --git a/gcalcli/argparsers.py b/gcalcli/argparsers.py
index a91a2e0..b2392e0 100644
--- a/gcalcli/argparsers.py
+++ b/gcalcli/argparsers.py
@@ -318,7 +318,10 @@ def get_argument_parser():
             help='update calendar from agenda TSV file',
             description='Update calendar from agenda TSV file.')
     agendaupdate.add_argument(
-        'file', type=argparse.FileType('r'), nargs='?', default=sys.stdin)
+        'file',
+        type=argparse.FileType('r', errors='replace'),
+        nargs='?',
+        default=sys.stdin)
 
     sub.add_parser(
             'updates',
@@ -395,7 +398,10 @@ def get_argument_parser():
             'must be specified.  Reads from stdin when no file argument is '
             'provided.')
     _import.add_argument(
-            'file', type=argparse.FileType('r'), nargs='?', default=None)
+            'file',
+            type=argparse.FileType('r', errors='replace'),
+            nargs='?',
+            default=None)
     _import.add_argument(
             '--verbose', '-v', action='count', help='Be verbose on imports')
     _import.add_argument(
diff --git a/tests/test_gcalcli.py b/tests/test_gcalcli.py
index 7d51d95..a065e0d 100644
--- a/tests/test_gcalcli.py
+++ b/tests/test_gcalcli.py
@@ -6,7 +6,6 @@
 from json import load
 import re
 
-import pytest
 from dateutil.tz import tzutc
 
 from gcalcli.argparsers import (
@@ -274,14 +273,11 @@ def test_modify_event(PatchedGCalI):
             gcal._edit_event, opts.text, opts.start, opts.end) == 0
 
 
-@pytest.mark.skipif(
-        os.name == 'nt',
-        reason='Known unicode encode/decode issue, see insanum/gcalcli#387.')
 def test_import(PatchedGCalI):
     cal_names = parse_cal_names(['jcrowgey@uw.edu'])
     gcal = PatchedGCalI(cal_names=cal_names, default_reminders=True)
     vcal_path = TEST_DATA_DIR + '/vv.txt'
-    assert gcal.ImportICS(icsFile=open(vcal_path))
+    assert gcal.ImportICS(icsFile=open(vcal_path, errors='replace'))
 
 
 def test_parse_reminder():