More future warnings fixes

dingusdk · Jan 23, 2020 · ada19ac · ada19ac
1 parent ee3a3fd
commit ada19ac
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/ihcsdk/ihcclient.py b/ihcsdk/ihcclient.py
@@ -169,7 +169,7 @@ def get_runtime_value(self, resourceid: int):
         xdoc = self.connection.soap_action('/ws/ResourceInteractionService',
                                            'getResourceValue',
                                            payload)
-        if not xdoc:
+        if xdoc == False:
             return False
         boolresult = xdoc.find(
             './SOAP-ENV:Body/ns1:getRuntimeValue2/ns1:value/ns2:value',
@@ -227,7 +227,7 @@ def wait_for_resource_value_changes(self, wait: int=10):
                   """.format(timeout=wait)
         xdoc = self.connection.soap_action('/ws/ResourceInteractionService',
                                            'getResourceValue', payload)
-        if not xdoc:
+        if xdoc == False:
             return False
         result = xdoc.findall(
             './SOAP-ENV:Body/ns1:waitForResourceValueChanges2/ns1:arrayItem',

diff --git a/ihcsdk/ihcconnection.py b/ihcsdk/ihcconnection.py
@@ -43,6 +43,8 @@ def soap_action(self, service, action, payloadbody):
         self.cookies = response.cookies
         try:
             xdoc = xml.etree.ElementTree.fromstring(response.text)
+            if xdoc is None:
+              return False
         except xml.etree.ElementTree.ParseError as exp:
             self.last_exception = exp
             self.last_response = response

diff --git a/ihcsdk/ihccurlconnection.py b/ihcsdk/ihccurlconnection.py
@@ -53,6 +53,8 @@ def soap_action(self, service, action, payloadbody):
             return False
         try:
             xdoc = xml.etree.ElementTree.fromstring(body)
+            if xdoc is None:
+              return False
         except xml.etree.ElementTree.ParseError:
             return False
         return xdoc
diff --git a/ihcsdk/ihcsslconnection.py b/ihcsdk/ihcsslconnection.py
@@ -34,6 +34,8 @@ def soap_action(self, service, action, payloadbody):
             return False
         try:
             xdoc = xml.etree.ElementTree.fromstring(response.text)
+            if xdoc is None:
+              return False
         except xml.etree.ElementTree.ParseError:
             return False
         return xdoc

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name='ihcsdk',
-    version='2.4.0',
+    version='2.5.0',
     description='IHC Python SDK',
     long_description=("SDK for connection to the LK IHC Controller. "
                       "Made for interfacing to home assistant"),