Rationalize handling of values in TXT records

mtdcr · web-flow · commit 8e3adf8300a6 · 2020-03-08T00:59:46.000+01:00
* Do not interpret received values; use None if a property has no value
* When encoding values, use either raw bytes or UTF-8
diff --git a/zeroconf/__init__.py b/zeroconf/__init__.py
@@ -1646,20 +1646,12 @@ def _set_properties(self, properties: Union[bytes, Dict]) -> None:
                 if isinstance(key, str):
                     key = key.encode('utf-8')
 
-                if value is None:
-                    suffix = b''
-                elif isinstance(value, str):
-                    suffix = value.encode('utf-8')
-                elif isinstance(value, bytes):
-                    suffix = value
-                elif isinstance(value, int):
-                    if value:
-                        suffix = b'true'
-                    else:
-                        suffix = b'false'
-                else:
-                    suffix = b''
-                list_.append(b'='.join((key, suffix)))
+                record = key
+                if value is not None:
+                    if not isinstance(value, bytes):
+                        value = str(value).encode('utf-8')
+                    record += b'=' + value
+                list_.append(record)
             for item in list_:
                 result = b''.join((result, int2byte(len(item)), item))
             self.text = result
@@ -1682,16 +1674,11 @@ def _set_text(self, text: bytes) -> None:
         for s in strs:
             parts = s.split(b'=', 1)
             try:
-                key, value = parts  # type: Tuple[bytes, Union[bool, bytes]]
+                key, value = parts  # type: Tuple[bytes, Optional[bytes]]
             except ValueError:
                 # No equals sign at all
                 key = s
-                value = False
-            else:
-                if value == b'true':
-                    value = True
-                elif value == b'false' or not value:
-                    value = False
+                value = None
 
             # Only update non-existent properties
             if key and result.get(key) is None:
diff --git a/zeroconf/test.py b/zeroconf/test.py
@@ -1009,19 +1009,19 @@ def update_service(self, zeroconf, type, name):
             # get service info without answer cache
             info = zeroconf_browser.get_service_info(type_, registration_name)
             assert info is not None
-            assert info.properties[b'prop_none'] is False
+            assert info.properties[b'prop_none'] is None
             assert info.properties[b'prop_string'] == properties['prop_string']
-            assert info.properties[b'prop_float'] is False
+            assert info.properties[b'prop_float'] == b'1.0'
             assert info.properties[b'prop_blank'] == properties['prop_blank']
-            assert info.properties[b'prop_true'] is True
-            assert info.properties[b'prop_false'] is False
+            assert info.properties[b'prop_true'] == b'1'
+            assert info.properties[b'prop_false'] == b'0'
             assert info.addresses == addresses[:1]  # no V6 by default
             all_addresses = info.addresses_by_version(r.IPVersion.All)
             assert all_addresses == addresses, all_addresses
 
             info = zeroconf_browser.get_service_info(subtype, registration_name)
             assert info is not None
-            assert info.properties[b'prop_none'] is False
+            assert info.properties[b'prop_none'] is None
 
             # test TXT record update
             sublistener = MySubListener()
