[openrtm-commit:02906] r894 - branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-11-07 17:21:34 +0900 (Tue, 07 Nov 2017)
New Revision: 894

Modified:
   branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMProvider.py
   branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/NamingManager.py
   branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/SharedMemory.py
   branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/uuid.py
Log:
[merge] r892-893 have been merged from trunk.

Modified: branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMProvider.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMProvider.py	2017-11-02 09:12:37 UTC (rev 893)
+++ branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMProvider.py	2017-11-07 08:21:34 UTC (rev 894)
@@ -151,7 +151,7 @@
   #
   # @endif
   #
-  # ::OpenRTM::PortStatus put(const ::OpenRTM::CdrData& data)
+  # ::OpenRTM::PortStatus put()
   #  throw (CORBA::SystemException);
   def put(self):
     

Modified: branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/NamingManager.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/NamingManager.py	2017-11-02 09:12:37 UTC (rev 893)
+++ branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/NamingManager.py	2017-11-07 08:21:34 UTC (rev 894)
@@ -20,7 +20,7 @@
 
 
 import OpenRTM_aist
-import CORBA
+from omniORB import CORBA
 import RTM
 import RTC
 import CosNaming

Modified: branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/SharedMemory.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/SharedMemory.py	2017-11-02 09:12:37 UTC (rev 893)
+++ branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/SharedMemory.py	2017-11-07 08:21:34 UTC (rev 894)
@@ -303,7 +303,7 @@
   #
   # @endif
   #
-  # void write(cdrMemoryStream& data);
+  # void write(const cdrMemoryStream& data);
   def write(self, data):
     self._rtcout.RTC_TRACE("write()")
     
@@ -347,7 +347,7 @@
   #
   # @endif
   #
-  # void read(::OpenRTM::CdrData_out data);
+  # cdrMemoryStream read(data);
   def read(self):
     self._rtcout.RTC_TRACE("read()")
     if self._shmem:
@@ -382,7 +382,7 @@
   #
   # @endif
   #
-  # void close(int memory_size, string shm_address);
+  # void setInterface(::OpenRTM::PortSharedMemory_var sm);
   def setInterface(self, sm):
     self._smInterface = sm
 
@@ -404,7 +404,7 @@
   #
   # @endif
   #
-  # PortStatus setEndian();
+  # void setEndian(bool endian);
   def setEndian(self, endian):
     self._endian = endian
     if not CORBA.is_nil(self._smInterface):

Modified: branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/uuid.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/uuid.py	2017-11-02 09:12:37 UTC (rev 893)
+++ branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/uuid.py	2017-11-07 08:21:34 UTC (rev 894)
@@ -79,7 +79,10 @@
             if len(bytes) != 16:
                 raise ValueError('bytes is not a 16-char string')
             def ord_func(v):
-                return ord(chr(v))
+                if sys.version_info[0] == 3:
+                    return ord(chr(v))
+                else:
+                    return ord(v)
             int_value = long(('%02x'*16) % tuple(map(ord_func, bytes)), 16)
         if fields:
             if len(fields) != 6: