Correctly handle   in names

nielstron · Jan 8, 2021 · ad6a3e0 · ad6a3e0
1 parent 152e9a7
commit ad6a3e0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/pyblnet/blnet_web.py b/pyblnet/blnet_web.py
@@ -205,11 +205,14 @@ def read_analog_values(self):
         for match in match_iter:
             match_dict = match.groupdict()
             # convert html entities to unicode characters
-            for key in match_dict.keys():
+            for key, value in match_dict.items():
+                # replace &nbsp; by " " since it is not unescaped as expected
+                value = value.replace("&nbsp;", " ")
                 if key == "value":
-                    match_dict[key] = match_dict[key].replace(",", ".").replace("&nbsp;", "")
-                match_dict[key] = html.unescape(match_dict[key])
-                # also replace decimal "," by "." and remove "&nbsp;"
+                    # for values
+                    # also replace decimal "," by "." and remove "&nbsp;" completely
+                    value = value.replace(",", ".").replace(" ", "")
+                match_dict[key] = html.unescape(value)
             # and append formatted dict
             data.append(match_dict)
         return data
@@ -253,8 +256,9 @@ def read_digital_values(self):
         for match in match_iter:
             match_dict = match.groupdict()
             # convert html entities to unicode characters
-            for key in match_dict.keys():
-                match_dict[key] = html.unescape(match_dict[key])
+            for key, value in match_dict.items():
+                value = value.replace("&nbsp;", " ")
+                match_dict[key] = html.unescape(value)
             # and append formatted dict
             data.append(match_dict)
         return data

diff --git a/pyblnet/tests/web_raw/web_state.py b/pyblnet/tests/web_raw/web_state.py
@@ -23,7 +23,7 @@
                 'unit_of_measurement': '°C',
                 'value': '24.6'},
             7: {'id': '7',
-                'name': 'T\xa0Kaminofen',
+                'name': 'T Kaminofen',
                 'unit_of_measurement': '°C',
                 'value': '20.9'},
             9: {'id': '9',
@@ -48,7 +48,7 @@
                  'value': 'AUS'},
              7: {'id': '7',
                  'mode': 'AUTO',
-                 'name': 'P\xa0Kaminofen',
+                 'name': 'P Kaminofen',
                  'value': 'EIN'},
              10: {'id': '10',
                   'mode': 'HAND',
@@ -92,7 +92,7 @@
         },
         7: {
             'id': '7',
-            'name': 'T\xa0Kaminofen',
+            'name': 'T Kaminofen',
             'value': '55.8',
             'unit_of_measurement': '°C'
         },
@@ -130,7 +130,7 @@
         },
         7: {
             'id': '7',
-            'name': 'P\xa0Kaminofen',
+            'name': 'P Kaminofen',
             'mode': 'AUTO',
             'value': 'EIN'
         },
@@ -159,7 +159,7 @@
   'value': '-72.3'},
  {'id': '6', 'name': 'Temp.Raum', 'unit_of_measurement': '°C', 'value': '24.6'},
  {'id': '7',
-  'name': 'T\xa0Kaminofen',
+  'name': 'T Kaminofen',
   'unit_of_measurement': '°C',
   'value': '20.9'},
  {'id': '9', 'name': 'TZirku.RL', 'unit_of_measurement': '°C', 'value': '36.6'}]
@@ -196,7 +196,7 @@
 },
 {
     'id': '7',
-    'name': 'T\xa0Kaminofen',
+    'name': 'T Kaminofen',
     'unit_of_measurement': '°C',
     'value': '55.8'
 },
@@ -230,7 +230,7 @@
 }, {
     'id': '7',
     'mode': 'AUTO',
-    'name': 'P\xa0Kaminofen',
+    'name': 'P Kaminofen',
     'value': 'EIN'
 }, {
     'id': '10',