[openrtm-commit:02143] r757 - trunk/OpenRTM-aist-Python/OpenRTM_aist
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2016年 11月 25日 (金) 19:39:37 JST
Author: miyamoto
Date: 2016-11-25 19:39:37 +0900 (Fri, 25 Nov 2016)
New Revision: 757
Modified:
trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrConsumer.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoConfiguration.py
trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoOrganization.py
Log:
[compat,bugfix,->RELENG_1_2] fixed bug.
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py 2016-11-25 01:54:08 UTC (rev 756)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py 2016-11-25 10:39:37 UTC (rev 757)
@@ -187,7 +187,6 @@
def init(*arg):
global manager
global mutex
-
if len(arg) == 1:
argv = arg[0]
elif len(arg) == 2 and \
@@ -198,6 +197,7 @@
else:
print "Invalid arguments for init()"
print "init(argc,argv) or init(argv)"
+ return None
if manager is None:
guard = OpenRTM_aist.ScopedLock(mutex)
@@ -665,7 +665,7 @@
self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
return False
- return
+
##
@@ -725,9 +725,9 @@
self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
return False
- return False
+
##
# @if jp
# @brief ファクトリ全リストを取得する
@@ -2222,7 +2222,7 @@
type_conf = category + "." + type_name + ".config_file"
name_conf = category + "." + inst_name + ".config_file"
-
+
type_prop = OpenRTM_aist.Properties()
name_prop = OpenRTM_aist.Properties()
@@ -2482,11 +2482,11 @@
self._rtcout.RTC_ERROR("Module load error: %s", file_name)
self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
- return
+
##
# @if jp
#
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrConsumer.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrConsumer.py 2016-11-25 01:54:08 UTC (rev 756)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/OutPortCorbaCdrConsumer.py 2016-11-25 10:39:37 UTC (rev 757)
@@ -71,7 +71,6 @@
#
def __init__(self):
OpenRTM_aist.CorbaConsumer.__init__(self)
- print "test"
self._rtcout = OpenRTM_aist.Manager.instance().getLogbuf("OutPortCorbaCdrConsumer")
self._buffer = None
self._profile = None
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py 2016-11-25 01:54:08 UTC (rev 756)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py 2016-11-25 10:39:37 UTC (rev 757)
@@ -1919,7 +1919,7 @@
self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
raise SDOPackage.InternalError("get_service_profiles()")
- return []
+
##
@@ -1982,7 +1982,7 @@
self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
raise SDOPackage.InternalError("get_service_profile()")
- return SDOPackage.ServiceProfile("", "", [], None)
+
##
@@ -2049,7 +2049,7 @@
except:
self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
raise SDOPackage.InternalError("get_service()")
- return SDOPackage.SDOService._nil
+
##
@@ -2101,13 +2101,13 @@
def get_configuration(self):
self._rtcout.RTC_TRACE("get_configuration()")
if self._SdoConfig is None:
- raise SODPackage.InterfaceNotImplemented("InterfaceNotImplemented: get_configuration")
+ raise SDOPackage.InterfaceNotImplemented("InterfaceNotImplemented: get_configuration")
try:
return self._SdoConfig
except:
self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
raise SDOPackage.InternalError("get_configuration()")
- return SDOPackage.Configuration._nil
+
##
@@ -2206,7 +2206,7 @@
except:
self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
raise SDOPackage.InternalError("get_organizations()")
- return []
+
##
@@ -2249,7 +2249,7 @@
except:
self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
raise SDOPackage.InternalError("get_status_list()")
- return []
+
##
@@ -4734,7 +4734,7 @@
args_ = self._properties.getProperty("execution_contexts")
ecs_tmp_ = [s.strip() for s in args_.split(",")]
- if not ecs_tmp_:
+ if not ecs_tmp_[0]:
return RTC.RTC_ERROR
self._rtcout.RTC_DEBUG("Component specific e EC option available,")
self._rtcout.RTC_DEBUG("%s", args_)
@@ -4746,18 +4746,20 @@
self._rtcout.RTC_INFO("EC none. EC will not be bound to the RTC.")
ec_args = []
return RTC.RTC_OK
-
+
type_and_name_ = [s.strip() for s in ec_tmp.split("(")]
if len(type_and_name_) > 2:
self._rtcout.RTC_DEBUG("Invalid EC type specified: %s", ec_tmp)
continue
- p_ = default_opts_;
+ p_ = default_opts_
+
# create EC's properties
p_.setProperty("type",type_and_name_[0])
self._rtcout.RTC_DEBUG("p_type: %s", p_.getProperty("type"))
p_type_ = self._properties.findNode("ec." + p_.getProperty("type"))
+
if p_type_:
self._rtcout.RTC_DEBUG("p_type props:")
self._rtcout.RTC_DEBUG(p_type_)
@@ -4770,9 +4772,9 @@
#self._rtcout.RTC_DEBUG("size: %d, name: %s",
# (len(type_and_name_), type_and_name_[1]))
- if len(type_and_name_) == 2 and type_and_name_[1][len(type_and_name_[1]) - 1] == ')':
+ if len(type_and_name_) == 2 and type_and_name_[1][-1] == ')':
type_and_name_ = type_and_name_[1][:-1]
- p_.setProperty("name", type_and_name_[1])
+ p_.setProperty("name", type_and_name_)
p_name_ = self._properties.findNode("ec." + p_.getProperty("name"))
if p_name_:
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoConfiguration.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoConfiguration.py 2016-11-25 01:54:08 UTC (rev 756)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoConfiguration.py 2016-11-25 10:39:37 UTC (rev 757)
@@ -958,7 +958,6 @@
self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
raise SDOPackage.InternalError("Configuration.get_active_configuration_set()")
- return SDOPackage.ConfigurationSet("","",[])
##
Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoOrganization.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoOrganization.py 2016-11-25 01:54:08 UTC (rev 756)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/SdoOrganization.py 2016-11-25 10:39:37 UTC (rev 757)
@@ -268,9 +268,9 @@
self.__rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
raise SDOPackage.InternalError("add_organization_property()")
- return False
+
##
# @if jp
#
@@ -484,9 +484,9 @@
self.__rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
raise SDOPackage.InternalError("set_owner()")
- return True
+
##
# @if jp
#
@@ -587,9 +587,9 @@
self.__rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
raise SDOPackage.InternalError("set_members()")
- return True
+
##
# @if jp
#
@@ -640,9 +640,9 @@
self.__rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
raise SDOPackage.InternalError("add_members()")
- return False
+
##
# @if jp
#
@@ -699,9 +699,9 @@
self.__rtcout.RTC_ERROR("unknown exception")
raise SDOPackage.InternalError("remove_member(): Not found.")
- return False
+
##
# @if jp
#
@@ -800,9 +800,9 @@
self.__rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
raise SDOPackage.InternalError("set_dependency(): Unknown.")
- return False
+
def getObjRef(self):
return self._objref
More information about the openrtm-commit
mailing list