[openrtm-commit:03137] r932 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-01-24 15:55:10 +0900 (Wed, 24 Jan 2018)
New Revision: 932

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortPullConnector.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortPushConnector.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortPullConnector.py
Log:
[compat, bugfix, ->RELENG_1_2] fixed bug

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortPullConnector.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortPullConnector.py	2018-01-24 06:38:51 UTC (rev 931)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortPullConnector.py	2018-01-24 06:55:10 UTC (rev 932)
@@ -124,7 +124,7 @@
   #                     OutPortConsumer* consumer,
   #                     ConnectorListeners& listeners,
   #                     CdrBufferBase* buffer = 0);
-  def __init__(self, info, consumer, listeners, buffer = 0):
+  def __init__(self, info, consumer, listeners, buffer = None):
     OpenRTM_aist.InPortConnector.__init__(self, info, buffer)
     self._consumer = consumer
     self._listeners = listeners
@@ -132,10 +132,10 @@
     self._outPortListeners = None
 
 
-    if buffer == 0:
+    if buffer is None:
       self._buffer = self.createBuffer(self._profile)
 
-    if self._buffer == 0 or not self._consumer:
+    if not self._buffer or not self._consumer:
       raise
         
     self._buffer.init(info.properties.getNode("buffer"))

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortPushConnector.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortPushConnector.py	2018-01-24 06:38:51 UTC (rev 931)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortPushConnector.py	2018-01-24 06:55:10 UTC (rev 932)
@@ -119,7 +119,7 @@
   #
   # InPortPushConnector(ConnectorInfo info, InPortProvider* provider,
   #                    ConnectorListeners listeners, CdrBufferBase* buffer = 0);
-  def __init__(self, info, provider, listeners, buffer = 0):
+  def __init__(self, info, provider, listeners, buffer = None):
     OpenRTM_aist.InPortConnector.__init__(self, info, buffer)
     self._provider = provider
     self._listeners = listeners

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortPullConnector.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortPullConnector.py	2018-01-24 06:38:51 UTC (rev 931)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortPullConnector.py	2018-01-24 06:55:10 UTC (rev 932)
@@ -123,7 +123,7 @@
   #                      OutPortProvider* provider,
   #                      ConnectorListeners& listeners,
   #                      CdrBufferBase* buffer = 0);
-  def __init__(self, info, provider, listeners, buffer = 0):
+  def __init__(self, info, provider, listeners, buffer = None):
     OpenRTM_aist.OutPortConnector.__init__(self, info)
     self._provider = provider
     self._listeners = listeners