From 6458eac93b1e3c6d45e26a7ddb434d692b5cdff2 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 22 Jan 2021 12:43:15 -0500 Subject: [PATCH] Tolerate multiple forms of 'stringy' The fromstring needs to accept either, so amend it to do so. --- confluent_server/confluent/discovery/handlers/smm.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/confluent_server/confluent/discovery/handlers/smm.py b/confluent_server/confluent/discovery/handlers/smm.py index a96eb410..4f7d10d0 100644 --- a/confluent_server/confluent/discovery/handlers/smm.py +++ b/confluent_server/confluent/discovery/handlers/smm.py @@ -30,7 +30,11 @@ getaddrinfo = eventlet.support.greendns.getaddrinfo from xml.etree.ElementTree import fromstring as rfromstring def fromstring(inputdata): - if '!entity' in inputdata.lower(): + if isinstance(inputdata, bytes): + cmpstr = b'!entity' + else: + cmpstr = '!entity' + if cmpstr in inputdata.lower(): raise Exception('!ENTITY not supported in this interface') return rfromstring(inputdata)