Merge 0188a4a into 719b2d0

test/config_test.py

@@ -74,7 +74,7 @@ def test_config_connection(self):
              )
         ]
         for yaml_string, expected_conn in test_configs:
-            config = yaml.load(yaml_string)
+            config = yaml.safe_load(yaml_string)
             Config(TestConfig.xknx).parse_connection(config)
             self.assertEqual(TestConfig.xknx.connection_config, expected_conn)
 

xknx/core/config.py

@@ -27,7 +27,7 @@ def read(self, file='xknx.yaml'):
         self.xknx.logger.debug("Reading %s", file)
         try:
             with open(file, 'r') as filehandle:
-                doc = yaml.load(filehandle)
+                doc = yaml.safe_load(filehandle)
                 self.parse_general(doc)
                 self.parse_connection(doc)
                 self.parse_groups(doc)

xknx/devices/device.py

@@ -77,17 +77,17 @@ async def process(self, telegram):
             await self.process_group_read(telegram)
 
     async def process_group_read(self, telegram):
-        """Process incoming GROUP RESPONSE telegram."""
+        """Process incoming GroupValueRead telegrams."""
         # The dafault is, that devices dont answer to group reads
 
     async def process_group_response(self, telegram):
-        """Process incoming GROUP RESPONSE telegram."""
+        """Process incoming GroupValueResponse telegrams."""
         # Per default mapped to group write.
         await self.process_group_write(telegram)
 
     async def process_group_write(self, telegram):
-        """Process incoming GROUP WRITE telegram."""
-        # The dafault is, that devices dont answer to group reads
+        """Process incoming GroupValueWrite telegrams."""
+        # The dafault is, that devices dont process group writes
 
     def get_name(self):
         """Return name of device."""