[openrtm-commit:03050] r911 - branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2018-01-04 14:56:36 +0900 (Thu, 04 Jan 2018)
New Revision: 911

Modified:
   branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/Properties.py
Log:
[merge] r910 has been merged from trunk.

Modified: branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/Properties.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/Properties.py	2017-12-27 12:40:36 UTC (rev 910)
+++ branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/Properties.py	2018-01-04 05:56:36 UTC (rev 911)
@@ -240,7 +240,6 @@
     keys = prop.propertyNames()
 
     for key in keys:
-      node = None
       node = prop.getNode(key)
       if node:
         self.setDefault(key, node.default_value)
@@ -391,7 +390,6 @@
       #keys = str.split(key, ".")
       self.split(key, ".", keys)
 
-      node = None
       node = self._getNode(keys, 0, self)
       if node:
         if node.value:
@@ -427,7 +425,7 @@
     keys = []
     #keys = str.split(key, ".")
     self.split(key, ".", keys)
-    node = None
+
     node = self._getNode(keys, 0, self)
     if node:
       return node.default_value