[openrtm-commit:02132] r749 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2016-11-22 19:39:54 +0900 (Tue, 22 Nov 2016)
New Revision: 749

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortBase.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortBase.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrConsumer.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/PortConnectListener.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/Properties.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/PublisherFlush.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoConfiguration.py
Log:
[compat,bugfix,->RELENG_1_2] fixed bug.

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortBase.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortBase.py	2016-11-21 10:13:14 UTC (rev 748)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortBase.py	2016-11-22 10:39:54 UTC (rev 749)
@@ -1014,7 +1014,7 @@
                            OpenRTM_aist.flatten(provider_types))
 
     if self._properties.hasKey("provider_types") and \
-          OpenRTM_aist.normalize(self._properties.getProperty("provider_types")) != "all":
+          OpenRTM_aist.normalize([self._properties.getProperty("provider_types")]) != "all":
       self._rtcout.RTC_DEBUG("allowed providers: %s",
                              self._properties.getProperty("provider_types"))
 
@@ -1058,7 +1058,7 @@
                            OpenRTM_aist.flatten(consumer_types))
 
     if self._properties.hasKey("consumer_types") and \
-          OpenRTM_aist.normalize(self._properties.getProperty("consumer_types")) != "all":
+          OpenRTM_aist.normalize([self._properties.getProperty("consumer_types")]) != "all":
       self._rtcout.RTC_DEBUG("allowed consumers: %s",
                              self._properties.getProperty("consumer_types"))
 
@@ -1098,7 +1098,7 @@
   # InPortProvider*
   # createProvider(ConnectorProfile& cprof, coil::Properties& prop);
   def createProvider(self, cprof, prop):
-    if not prop.getProperty("interface_type") and \
+    if not prop.getProperty("interface_type") or \
           not OpenRTM_aist.includes(self._providerTypes, prop.getProperty("interface_type")):
       self._rtcout.RTC_ERROR("no provider found")
       self._rtcout.RTC_DEBUG("interface_type:  %s", prop.getProperty("interface_type"))
@@ -1138,7 +1138,7 @@
   # OutPortConsumer*
   # createConsumer(const ConnectorProfile& cprof, coil::Properties& prop);
   def createConsumer(self, cprof, prop):
-    if not prop.getProperty("interface_type") and \
+    if not prop.getProperty("interface_type") or \
           not OpenRTM_aist.includes(self._consumerTypes, prop.getProperty("interface_type")):
       self._rtcout.RTC_ERROR("no consumer found")
       self._rtcout.RTC_DEBUG("interface_type:  %s", prop.getProperty("interface_type"))

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortBase.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortBase.py	2016-11-21 10:13:14 UTC (rev 748)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortBase.py	2016-11-22 10:39:54 UTC (rev 749)
@@ -1131,7 +1131,7 @@
   # OutPortProvider*
   # OutPortBase::createProvider(ConnectorProfile& cprof, coil::Properties& prop)
   def createProvider(self, cprof, prop):
-    if prop.getProperty("interface_type") and \
+    if not prop.getProperty("interface_type") or \
           not OpenRTM_aist.includes(self._providerTypes, prop.getProperty("interface_type")):
       self._rtcout.RTC_ERROR("no provider found")
       self._rtcout.RTC_DEBUG("interface_type:  %s", prop.getProperty("interface_type"))
@@ -1167,8 +1167,8 @@
   # InPortConsumer* OutPortBase::createConsumer(const ConnectorProfile& cprof,
   #                                             coil::Properties& prop)
   def createConsumer(self, cprof, prop):
-    if prop.getProperty("interface_type") and \
-          not self._consumerTypes.count(prop.getProperty("interface_type")):
+    if not prop.getProperty("interface_type") or \
+          not OpenRTM_aist.includes(self._consumerTypes, prop.getProperty("interface_type")):
       self._rtcout.RTC_ERROR("no consumer found")
       self._rtcout.RTC_DEBUG("interface_type:  %s", prop.getProperty("interface_type"))
       self._rtcout.RTC_DEBUG("interface_types: %s",

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrConsumer.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrConsumer.py	2016-11-21 10:13:14 UTC (rev 748)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrConsumer.py	2016-11-22 10:39:54 UTC (rev 749)
@@ -363,9 +363,8 @@
       self.onSenderError()
       return self.UNKNOWN_ERROR
 
-    self.onSenderError()
-    return self.UNKNOWN_ERROR
 
+
     
   ##
   # @brief Connector data listener functions

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/PortConnectListener.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/PortConnectListener.py	2016-11-21 10:13:14 UTC (rev 748)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/PortConnectListener.py	2016-11-22 10:39:54 UTC (rev 749)
@@ -427,9 +427,9 @@
     for i in range(len_):
       if (self._listeners[i].listener == listener) and self._listeners[i].autoclean:
         self._listeners[i].listener = None
-      del self._listeners[i]
-      del guard
-      return
+        del self._listeners[i]
+        del guard
+        return
     del guard
     return
 
@@ -553,9 +553,9 @@
     for i in range(len_):
       if (self._listeners[i].listener == listener) and self._listeners[i].autoclean:
         self._listeners[i].listener = None
-      del self._listeners[i]
-      del guard
-      return
+        del self._listeners[i]
+        del guard
+        return
     del guard
     return
 

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Properties.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Properties.py	2016-11-21 10:13:14 UTC (rev 748)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Properties.py	2016-11-22 10:39:54 UTC (rev 749)
@@ -1233,7 +1233,7 @@
     else:
       return next
 
-    return None
+    
 
 
   ##

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/PublisherFlush.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/PublisherFlush.py	2016-11-21 10:13:14 UTC (rev 748)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/PublisherFlush.py	2016-11-22 10:39:54 UTC (rev 749)
@@ -309,7 +309,7 @@
       self.onReceiverError(data)
       return self._retcode
 
-    return self._retcode
+    
 
 
   ##

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoConfiguration.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoConfiguration.py	2016-11-21 10:13:14 UTC (rev 748)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoConfiguration.py	2016-11-22 10:39:54 UTC (rev 749)
@@ -1071,7 +1071,7 @@
       self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
       raise SDOPackage.InternalError("Configuration.remove_configuration_set()")
 
-    return False
+    
 
 
   ##
@@ -1135,7 +1135,7 @@
     else:
       raise SDOPackage.InternalError("Configuration.activate_configuration_set()")
 
-    return False
+    
 
 
   #============================================================