[openrtm-commit:02398] r792 - trunk/OpenRTM-aist-Python/OpenRTM_aist
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 2月 7日 (火) 15:19:13 JST
Author: miyamoto
Date: 2017-02-07 15:19:13 +0900 (Tue, 07 Feb 2017)
New Revision: 792
Modified:
trunk/OpenRTM-aist-Python/OpenRTM_aist/CORBA_IORUtil.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/CORBA_RTCUtil.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/CPUAffinity.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/CdrBufferBase.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/CdrRingBuffer.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigurationListener.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/ConnectorListener.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/CorbaNaming.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/CorbaPort.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/ECFactory.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/ExecutionContextWorker.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/ExtTrigExecutionContext.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/GlobalFactory.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/InPort.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortCorbaCdrConsumer.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortCorbaCdrProvider.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortDirectConsumer.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortDirectProvider.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortProvider.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortPullConnector.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortPushConnector.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMConsumer.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMProvider.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerServant.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/ModuleManager.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/NVUtil.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/NamingManager.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/NamingServiceNumberingPolicy.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/NodeNumberingPolicy.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/NumberingPolicy.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/ObjectManager.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/OpenHRPExecutionContext.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPort.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrConsumer.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrProvider.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortDirectConsumer.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortDirectProvider.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortPullConnector.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortPushConnector.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortSHMConsumer.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortSHMProvider.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicECSharedComposite.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicExecutionContext.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicTask.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/PortAdmin.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/Process.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/Properties.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/PublisherPeriodic.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObjectStateMachine.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoConfiguration.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoOrganization.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoService.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoServiceConsumerBase.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoServiceProviderBase.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/SharedMemory.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/StringUtil.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/TimeMeasure.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/TimeValue.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/Typename.py
Log:
[compat,bugfix,->RELENG_1_2] fixed bug.
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/CORBA_IORUtil.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/CORBA_IORUtil.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/CORBA_IORUtil.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -251,13 +251,14 @@
# TAG_MULTIPLE_COMPONENTS
elif p.tag == IOP.TAG_MULTIPLE_COMPONENTS:
profiles = cdrUnmarshal(_0__GlobalIDL._tc_MultipleComponentProfile,
- "".join(p.profile_data, endian))
- addr += extractAddrs(profiles.components)
+ "".join(p.profile_data), endian)
+ addr += extractAddrs(profiles)
else:
print "Other Profile"
return addr
def extractAddrs(comps):
+ global endian
addr = []
for c in comps:
# print "TAG component type: ", IOP.ComponentID[c.tag]
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/CORBA_RTCUtil.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/CORBA_RTCUtil.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/CORBA_RTCUtil.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -11,8 +11,8 @@
import OpenRTM_aist
from omniORB import CORBA
import RTC
-import SDOPackage
+
##
# @if jp
#
@@ -62,7 +62,7 @@
if rtc._non_existent():
return False
return True
- except CORBA.SystemException, ex:
+ except CORBA.SystemException:
return False
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/CPUAffinity.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/CPUAffinity.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/CPUAffinity.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -8,7 +8,7 @@
# @author Nobuhiko Miyamoto
#
-import sys
+
import os
import platform
import ctypes
@@ -69,7 +69,7 @@
flag = PROCESS_QUERY_INFORMATION | PROCESS_SET_INFORMATION
- h = ctypes.windll.kernel32.OpenProcess(flag, 0, pid)
+ ctypes.windll.kernel32.OpenProcess(flag, 0, pid)
result = ctypes.windll.kernel32.SetProcessAffinityMask(ctypes.windll.kernel32.GetCurrentProcess(), cpu_num)
@@ -124,11 +124,9 @@
if platform.system() == "Windows":
- PROCESS_QUERY_INFORMATION = 0x0400
- PROCESS_SET_INFORMATION = 0x0200
+
-
h = ctypes.windll.kernel32.GetCurrentThread()
result = ctypes.windll.kernel32.SetThreadAffinityMask(h, cpu_num)
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/CdrBufferBase.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/CdrBufferBase.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/CdrBufferBase.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -17,8 +17,8 @@
#
import OpenRTM_aist
-from OpenRTM_aist import *
+
class CdrBufferBase(OpenRTM_aist.BufferBase):
def __init__(self):
pass
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/CdrRingBuffer.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/CdrRingBuffer.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/CdrRingBuffer.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -17,8 +17,8 @@
import OpenRTM_aist
-from OpenRTM_aist import *
+
class CdrRingBuffer(OpenRTM_aist.RingBuffer):
"""
"""
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -16,7 +16,7 @@
-import copy
+
import OpenRTM_aist
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigurationListener.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigurationListener.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigurationListener.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -13,8 +13,8 @@
# Advanced Industrial Science and Technology (AIST), Japan
# All rights reserved.
-import OpenRTM_aist
+
##
# @if jp
# @brief ConfigurationParamListener のタイプ
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ConnectorListener.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ConnectorListener.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ConnectorListener.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -15,7 +15,7 @@
# Advanced Industrial Science and Technology (AIST), Japan
# All rights reserved.
-from omniORB import *
+from omniORB import cdrUnmarshal
from omniORB import any
import OpenRTM_aist
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/CorbaNaming.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/CorbaNaming.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/CorbaNaming.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -351,7 +351,7 @@
except CosNaming.NamingContext.CannotProceed, err:
if force:
- self.rebindRecursive(err.cxt, err,rest_of_name, obj)
+ self.rebindRecursive(err.cxt, err.rest_of_name, obj)
else:
self.__print_exception()
raise
@@ -573,7 +573,7 @@
try:
obj = self._rootContext.resolve(name_)
return obj
- except CosNaming.NamingContext.NotFound, ex:
+ except CosNaming.NamingContext.NotFound:
self.__print_exception()
return None
@@ -1092,8 +1092,8 @@
end = len(name_list) - 1
sub_len = end - (begin -1)
- objId = ""
- kind = ""
+ #objId = ""
+ #kind = ""
sub_name = []
for i in range(sub_len):
@@ -1267,8 +1267,8 @@
kind = string_kind
tmp_bl = self.listBinding(string_name)
bl = []
- tmp_len = len(tmp_bl)
- list_len = 0
+ #tmp_len = len(tmp_bl)
+ #list_len = 0
for b in tmp_bl:
if b.binding_type == CosNaming.nobject:
last_index = len(b.binding_name)-1
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/CorbaPort.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/CorbaPort.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/CorbaPort.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -17,9 +17,9 @@
from omniORB import CORBA
from omniORB import any
-import traceback
-import sys
+
+
import OpenRTM_aist
import RTC
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ECFactory.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ECFactory.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ECFactory.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -15,9 +15,7 @@
# All rights reserved.
-import string
-import OpenRTM_aist
##
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ExecutionContextWorker.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ExecutionContextWorker.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ExecutionContextWorker.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -18,7 +18,7 @@
#
import threading
-from omniORB import CORBA, PortableServer
+from omniORB import CORBA
import OpenRTM_aist
import RTC
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ExtTrigExecutionContext.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ExtTrigExecutionContext.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ExtTrigExecutionContext.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -20,7 +20,7 @@
import time
import OpenRTM_aist
-import OpenRTM, OpenRTM__POA, RTC, RTC__POA
+import OpenRTM__POA, RTC
##
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/GlobalFactory.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/GlobalFactory.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/GlobalFactory.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -17,9 +17,9 @@
#
-import OpenRTM_aist
+
class Factory:
"""
"""
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/InPort.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/InPort.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/InPort.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -14,13 +14,13 @@
# Advanced Industrial Science and Technology (AIST), Japan
# All rights reserved.
-from omniORB import *
-from omniORB import any
-import sys
+
+
import copy
-import time
+
import OpenRTM_aist
+import threading
##
# @if jp
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortCorbaCdrConsumer.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortCorbaCdrConsumer.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortCorbaCdrConsumer.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -16,7 +16,7 @@
# All rights reserved.
#
-import sys
+
from omniORB import any
from omniORB import CORBA
import OpenRTM_aist
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortCorbaCdrProvider.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortCorbaCdrProvider.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortCorbaCdrProvider.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -15,10 +15,9 @@
# Advanced Industrial Science and Technology (AIST), Japan
# All rights reserved.
-import sys
-from omniORB import *
-from omniORB import any
+
+
import OpenRTM_aist
import OpenRTM__POA,OpenRTM
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortDirectConsumer.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortDirectConsumer.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortDirectConsumer.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -9,12 +9,10 @@
#
-import sys
-from omniORB import any
-from omniORB import CORBA
+
import OpenRTM_aist
-import OpenRTM
+
##
# @if jp
#
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortDirectProvider.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortDirectProvider.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortDirectProvider.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -8,13 +8,12 @@
# @author Nobuhiko Miyamoto
#
-import sys
-from omniORB import *
-from omniORB import any
+
+
import OpenRTM_aist
-import OpenRTM__POA,OpenRTM
+
##
# @if jp
# @class InPortDirectProvider
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortProvider.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortProvider.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortProvider.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -17,9 +17,9 @@
import OpenRTM_aist
-import SDOPackage, SDOPackage__POA
+
##
# @if jp
# @class InPortProvider
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortPullConnector.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortPullConnector.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortPullConnector.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -16,7 +16,7 @@
# All rights reserved.
#
-from omniORB import *
+from omniORB import cdrUnmarshal
from omniORB import any
import OpenRTM_aist
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortPushConnector.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortPushConnector.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortPushConnector.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -18,7 +18,7 @@
#
-from omniORB import *
+from omniORB import cdrUnmarshal
from omniORB import any
import OpenRTM_aist
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMConsumer.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMConsumer.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMConsumer.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -9,11 +9,8 @@
#
-import sys
-from omniORB import any
-from omniORB import CORBA
+
import OpenRTM_aist
-import OpenRTM
import OpenRTM__POA
import threading
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMProvider.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMProvider.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMProvider.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -8,12 +8,11 @@
# @author Nobuhiko Miyamoto
-import sys
-from omniORB import *
-from omniORB import any
+
+
import OpenRTM_aist
-import OpenRTM__POA,OpenRTM
+import OpenRTM
##
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -15,18 +15,18 @@
# All rights reserved.
import threading
-import string
+
import signal, os
-import traceback
+
import sys
import time
from omniORB import CORBA, PortableServer
from types import IntType, ListType
-import platform
+
import OpenRTM_aist
import RTC
-import SDOPackage
+
import CosNaming
import CORBA_IORUtil
@@ -57,8 +57,8 @@
# @else
# @brief Alarm for Windows
# @endif
-import os
-import time
+
+
import threading
class Alarm (threading.Thread):
@@ -1742,7 +1742,7 @@
self._orb.destroy()
self._rtcout.RTC_DEBUG("ORB was shutdown.")
self._orb = CORBA.Object._nil
- except CORBA.SystemException, ex:
+ except CORBA.SystemException:
self._rtcout.RTC_ERROR("Caught CORBA::SystemException during ORB shutdown.")
self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
except:
@@ -2096,7 +2096,7 @@
try:
otherref = file(self._config.getProperty("manager.refstring_path"),'r')
- refstring = otherref.readline()
+ #refstring = otherref.readline()
otherref.close()
except:
try:
@@ -2573,7 +2573,7 @@
# @endif
def __try_direct_load(self, file_name):
try:
- pathChanged=False
+ #pathChanged=False
splitted_name = os.path.split(file_name)
save_path = sys.path[:]
sys.path.append(splitted_name[0])
@@ -2751,7 +2751,7 @@
continue
try:
- p = portsvc.get_port_profile()
+ portsvc.get_port_profile()
except:
continue
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -17,7 +17,6 @@
import sys
import os
-import re
import getopt
import platform
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerServant.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerServant.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerServant.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -16,15 +16,14 @@
# All rights reserved.
import copy
-import sys
import threading
import time
from omniORB import CORBA
import OpenRTM_aist
import RTC,RTM,RTM__POA
-import SDOPackage
+
class terminate_Task(OpenRTM_aist.Task):
def __init__(self, mgr):
OpenRTM_aist.Task.__init__(self)
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ModuleManager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ModuleManager.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ModuleManager.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -15,7 +15,7 @@
# All rights reserved.
-import string
+
import sys,os
import glob
@@ -452,10 +452,10 @@
# file name with full path
fullname = fname
# directory name
- dirname = os.path.dirname(fname)
+ dirname = os.path.dirname(fullname)
sys.path.append(dirname)
# basename
- basename = os.path.basename(fname)
+ basename = os.path.basename(fullname)
# classname
classname = basename.split(".")[0].lower()
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/NVUtil.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/NVUtil.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/NVUtil.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -15,12 +15,11 @@
# Advanced Industrial Science and Technology (AIST), Japan
# All rights reserved.
-import sys
-import traceback
+
from omniORB import any
import OpenRTM_aist
-import SDOPackage, SDOPackage__POA
+import SDOPackage
##
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/NamingManager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/NamingManager.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/NamingManager.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -16,9 +16,9 @@
import threading
-import traceback
-import sys
+
+
import OpenRTM_aist
import CORBA
import RTM
@@ -316,7 +316,7 @@
tmp = name.split("://")
if len(tmp) > 1:
if tmp[0] == "rtcname":
- tag = tmp[0]
+ #tag = tmp[0]
url = tmp[1]
r = url.split("/")
if len(r) > 1:
@@ -495,7 +495,7 @@
if len(tmp) > 1:
if tmp[0] == "rtcloc":
- tag = tmp[0]
+ #tag = tmp[0]
url = tmp[1]
r = url.split("/")
if len(r) > 1:
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/NamingServiceNumberingPolicy.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/NamingServiceNumberingPolicy.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/NamingServiceNumberingPolicy.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -8,7 +8,7 @@
# @author Nobuhiko Miyamoto
#
-import string
+
import OpenRTM_aist
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/NodeNumberingPolicy.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/NodeNumberingPolicy.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/NodeNumberingPolicy.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -8,7 +8,7 @@
# @author Nobuhiko Miyamoto
#
-import string
+
import OpenRTM_aist
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/NumberingPolicy.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/NumberingPolicy.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/NumberingPolicy.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -14,7 +14,7 @@
# Advanced Industrial Science and Technology (AIST), Japan
# All rights reserved.
-import string
+
import OpenRTM_aist
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ObjectManager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ObjectManager.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ObjectManager.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -15,8 +15,7 @@
# All rights reserved.
-import sys
-import string
+
import threading
import OpenRTM_aist
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/OpenHRPExecutionContext.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/OpenHRPExecutionContext.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/OpenHRPExecutionContext.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -18,7 +18,7 @@
import time
import OpenRTM_aist
-import OpenRTM, OpenRTM__POA, RTC, RTC__POA
+import OpenRTM__POA, RTC
class OpenHRPExecutionContext(OpenRTM_aist.ExecutionContextBase,
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPort.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPort.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPort.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -17,7 +17,7 @@
# All rights reserved.
-from omniORB import *
+
from omniORB import any
import OpenRTM_aist
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrConsumer.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrConsumer.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrConsumer.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -17,7 +17,7 @@
# All rights reserved.
#
-import sys
+
from omniORB import any
import OpenRTM_aist
import OpenRTM
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrProvider.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrProvider.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrProvider.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -16,10 +16,8 @@
# All rights reserved.
#
-import sys
-from omniORB import *
-from omniORB import any
+
import OpenRTM_aist
import OpenRTM__POA,OpenRTM
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortDirectConsumer.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortDirectConsumer.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortDirectConsumer.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -9,11 +9,11 @@
#
-import sys
-from omniORB import any
+
+
import OpenRTM_aist
-import OpenRTM
+
##
# @if jp
#
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortDirectProvider.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortDirectProvider.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortDirectProvider.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -8,13 +8,12 @@
# @author Nobuhiko Miyamoto
#
-import sys
-from omniORB import *
-from omniORB import any
+
+
import OpenRTM_aist
-import OpenRTM__POA,OpenRTM
+
##
# @if jp
# @class OutPortDirectProvider
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortPullConnector.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortPullConnector.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortPullConnector.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -17,10 +17,11 @@
# All rights reserved.
#
-from omniORB import *
+from omniORB import cdrMarshal
from omniORB import any
import OpenRTM_aist
+import threading
##
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortPushConnector.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortPushConnector.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortPushConnector.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -17,7 +17,7 @@
# All rights reserved.
#
-from omniORB import *
+from omniORB import cdrMarshal
from omniORB import any
import OpenRTM_aist
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortSHMConsumer.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortSHMConsumer.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortSHMConsumer.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -10,8 +10,8 @@
#
#
-import sys
-from omniORB import any
+
+
import OpenRTM_aist
import OpenRTM
import OpenRTM__POA
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortSHMProvider.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortSHMProvider.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortSHMProvider.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -9,12 +9,10 @@
#
#
-import sys
-from omniORB import *
-from omniORB import any
+
import OpenRTM_aist
-import OpenRTM__POA,OpenRTM
+import OpenRTM
##
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicECSharedComposite.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicECSharedComposite.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicECSharedComposite.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -18,10 +18,9 @@
# $Id$
#
-import string
-import sys
-import time
+
+
from omniORB import CORBA
import OpenRTM
import RTC
@@ -300,7 +299,7 @@
def stopOwnedEC(self, member):
ecs = member._eclist
for ec in ecs:
- ret = ec.stop()
+ ec.stop()
return
@@ -315,7 +314,7 @@
def startOwnedEC(self, member):
ecs = member._eclist
for ec in ecs:
- ret = ec.start()
+ ec.start()
return
@@ -351,7 +350,7 @@
return
# set organization to target RTC's conf
- ret = member._config.remove_organization(self._pId)
+ member._config.remove_organization(self._pId)
return
@@ -371,7 +370,7 @@
else:
return
# set ec to target RTC
- ret = self._ec.add_component(member._rtobj)
+ self._ec.add_component(member._rtobj)
orglist = member._rtobj.get_organizations()
for org in orglist:
@@ -448,7 +447,7 @@
if len(portlist) == 0:
return
- comp_name = member._profile.instance_name
+ #comp_name = member._profile.instance_name
plist = member._profile.port_profiles
# port delegation
@@ -481,7 +480,7 @@
if len(portlist) == 0:
return
- comp_name = member._profile.instance_name
+ #comp_name = member._profile.instance_name
plist = member._profile.port_profiles
# port delegation
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicExecutionContext.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicExecutionContext.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicExecutionContext.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -14,16 +14,15 @@
# Advanced Industrial Science and Technology (AIST), Japan
# All rights reserved.
-import sys
-import copy
+
import threading
import time
-import os
-import platform
-from omniORB import CORBA, PortableServer
+
+
+
import OpenRTM_aist
-import OpenRTM
+
import RTC, RTC__POA
DEFAULT_PERIOD = 0.000001
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicTask.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicTask.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/PeriodicTask.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -418,7 +418,7 @@
if self._periodCount > self._periodCountMax:
guard = OpenRTM_aist.ScopedLock(self._periodStat.mutex)
self._periodStat.stat = self._periodTime.getStatistics()
- self_periodCount = 0
+ self._periodCount = 0
self._periodCount += 1
return
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/PortAdmin.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/PortAdmin.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/PortAdmin.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -14,10 +14,8 @@
# Advanced Industrial Science and Technology (AIST), Japan
# All rights reserved.
-import traceback
-import sys
-from omniORB import CORBA
+
import RTC
import OpenRTM_aist
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Process.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Process.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Process.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -47,7 +47,7 @@
'preexec_fn': os.setsid}
try:
- p = subprocess.Popen(args, **subproc_args)
+ subprocess.Popen(args, **subproc_args)
except OSError:
# fork failed
if sys.version_info[0:3] >= (2, 4, 0):
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Properties.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Properties.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Properties.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -17,8 +17,8 @@
import sys
-import string
+
import OpenRTM_aist
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/PublisherPeriodic.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/PublisherPeriodic.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/PublisherPeriodic.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -16,8 +16,8 @@
# All rights reserved.
import threading
-from omniORB import any
+
import OpenRTM_aist
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -16,8 +16,8 @@
-import string
-import sys
+
+
import copy
from omniORB import any
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObjectStateMachine.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObjectStateMachine.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObjectStateMachine.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -17,7 +17,7 @@
# $Id$
#
-from omniORB import CORBA, PortableServer
+from omniORB import CORBA
import OpenRTM_aist
import RTC
@@ -300,7 +300,7 @@
poa = OpenRTM_aist.Manager.instance().getPOA()
try:
self._rtObjPtr = poa.reference_to_servant(comp)
- except CORBA.SystemException, ex:
+ except CORBA.SystemException:
self._rtObjPtr = None
except:
self._rtObjPtr = None
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoConfiguration.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoConfiguration.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoConfiguration.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -14,7 +14,7 @@
# Advanced Industrial Science and Technology (AIST), Japan
# All rights reserved.
-import sys
+
import copy
import threading
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoOrganization.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoOrganization.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoOrganization.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -14,7 +14,7 @@
# Advanced Industrial Science and Technology (AIST), Japan
# All rights reserved.
-import sys
+
import omniORB.any
from omniORB import CORBA
import threading
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoService.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoService.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoService.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -15,8 +15,8 @@
# All rights reserved.
#
-import SDOPackage, SDOPackage__POA
+
##
# @if jp
#
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoServiceConsumerBase.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoServiceConsumerBase.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoServiceConsumerBase.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -13,7 +13,7 @@
# Advanced Industrial Science and Technology (AIST), Japan
# All rights reserved.
-import SDOPackage
+
import OpenRTM_aist
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoServiceProviderBase.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoServiceProviderBase.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoServiceProviderBase.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -15,9 +15,9 @@
# All rights reserved.
-import RTC
+
import OpenRTM_aist
-import SDOPackage, SDOPackage__POA
+import SDOPackage__POA
##
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/SharedMemory.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/SharedMemory.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/SharedMemory.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -8,7 +8,7 @@
# @author Nobuhiko Miyamoto
#
-import sys
+
import mmap, os
import platform, ctypes
from omniORB import cdrMarshal
@@ -74,7 +74,7 @@
pass
else:
from ctypes.util import find_library
- librt = find_library("librt")
+ #librt = find_library("librt")
#if librt is None:
# raise
#self.rt = ctypes.CDLL(librt)
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/StringUtil.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/StringUtil.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/StringUtil.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -16,8 +16,8 @@
-import string
+
##
# @if jp
# @brief 文字列がエスケープされているか判断する
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/SystemLogger.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -16,7 +16,7 @@
import sys
import traceback
-import time
+
import threading
import logging
import logging.handlers
@@ -126,10 +126,10 @@
if len(args) == 0:
return
elif len(args) == 2:
- name = args[0]
+ #name = args[0]
mode = args[1]
elif len(args) == 3:
- name = args[0]
+ #name = args[0]
mode = args[1]
fileName = args[2]
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/TimeMeasure.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/TimeMeasure.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/TimeMeasure.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -19,7 +19,7 @@
#
#
-import sys, os
+import sys
import time
import math
@@ -167,8 +167,8 @@
_fields_ = [('tv_sec', ctypes.c_long),
('tv_nsec', ctypes.c_long)]
- librt = ctypes.cdll.LoadLibrary('librt.so')
- ts = timespec(long(tv.tv_sec),long(tv.tv_usec*1000))
+ #librt = ctypes.cdll.LoadLibrary('librt.so')
+ #ts = timespec(long(tv.tv_sec),long(tv.tv_usec*1000))
#return librt.clock_settime(0, ctypes.pointer(ts))
return 0
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/TimeValue.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/TimeValue.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/TimeValue.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -16,8 +16,8 @@
# All rights reserved.
-import OpenRTM_aist
+
TIMEVALUE_ONE_SECOND_IN_USECS = 1000000 # 1 [sec] = 1000000 [usec]
##
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Typename.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Typename.py 2017-01-23 09:23:01 UTC (rev 791)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Typename.py 2017-02-07 06:19:13 UTC (rev 792)
@@ -16,11 +16,10 @@
# All rights reserved.
#
-from omniORB import *
-from omniORB import any
-import OpenRTM_aist
+
+
## const char* toTypename(value)
def toTypename(value):
return str(value._NP_RepositoryId)
More information about the openrtm-commit
mailing list