From 8c4d04a7cd0345d1cf79545c1dcc64ef630a44bc Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Fri, 11 Oct 2019 13:58:30 -0400
Subject: [PATCH] Try utf-8 and fallback to latin1 for 2/3 collective
datetime objects are latin1 encoded from python2.
Not an issue for pure python3 or python2 collectives, but
mitigating problems in the mixed environment
---
confluent_server/confluent/core.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/confluent_server/confluent/core.py b/confluent_server/confluent/core.py
index 3fdffd91..1b17da17 100644
--- a/confluent_server/confluent/core.py
+++ b/confluent_server/confluent/core.py
@@ -1028,7 +1028,10 @@ def dispatch_request(nodes, manager, element, configmanager, inputdata,
a['name']))
return
rsp += nrsp
- rsp = pickle.loads(rsp, **pargs)
+ try:
+ rsp = pickle.loads(rsp, **pargs)
+ except UnicodeDecodeError:
+ rsp = pickle.loads(rsp, encoding='latin1')
if isinstance(rsp, Exception):
raise rsp
yield rsp