[openrtm-commit:02852] r878 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-10-02 17:46:51 +0900 (Mon, 02 Oct 2017)
New Revision: 878

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/ModuleManager.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/PublisherNew.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/PublisherPeriodic.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/uuid.py
Log:
[compat,->RELENG_1_2] bug fix.

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ModuleManager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ModuleManager.py	2017-10-02 04:16:52 UTC (rev 877)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ModuleManager.py	2017-10-02 08:46:51 UTC (rev 878)
@@ -126,7 +126,7 @@
   # @else
   #
   # @endif
-  class Error:
+  class Error(Exception):
     def __init__(self, reason_):
       self.reason = reason_
 
@@ -139,7 +139,7 @@
   # @else
   #
   # @endif
-  class NotFound:
+  class NotFound(Exception):
     def __init__(self, name_):
       self.name = name_
 

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/PublisherNew.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/PublisherNew.py	2017-10-02 04:16:52 UTC (rev 877)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/PublisherNew.py	2017-10-02 08:46:51 UTC (rev 878)
@@ -678,7 +678,7 @@
       loopcnt = preskip/(self._skipn+1)
       postskip = self._skipn - self._leftskip
 
-      for i in range(loopcnt):
+      for i in range(int(loopcnt)):
         self._buffer.advanceRptr(postskip)
         cdr = self._buffer.get()
         self.onBufferRead(cdr)

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/PublisherPeriodic.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/PublisherPeriodic.py	2017-10-02 04:16:52 UTC (rev 877)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/PublisherPeriodic.py	2017-10-02 08:46:51 UTC (rev 878)
@@ -714,7 +714,7 @@
     preskip  = self._buffer.readable() + self._leftskip
     loopcnt  = preskip / (self._skipn + 1)
     postskip = self._skipn - self._leftskip
-    for i in range(loopcnt):
+    for i in range(int(loopcnt)):
       self._buffer.advanceRptr(postskip)
       cdr = self._buffer.get()
       self.onBufferRead(cdr)

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/uuid.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/uuid.py	2017-10-02 04:16:52 UTC (rev 877)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/uuid.py	2017-10-02 08:46:51 UTC (rev 878)
@@ -26,6 +26,8 @@
 
 
 
+
+
 ##
 # @if jp
 # @class UUID
@@ -76,7 +78,9 @@
         if bytes:
             if len(bytes) != 16:
                 raise ValueError('bytes is not a 16-char string')
-            int_value = long(('%02x'*16) % tuple(map(ord, bytes)), 16)
+            def ord_func(v):
+                return ord(chr(v))
+            int_value = long(('%02x'*16) % tuple(map(ord_func, bytes)), 16)
         if fields:
             if len(fields) != 6:
                 raise ValueError('fields is not a 6-tuple')