Skip to content

Fixed issue with parsing the type of a simple sequence in a struct #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 8, 2017
Merged

Fixed issue with parsing the type of a simple sequence in a struct #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions rest/helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,27 @@ def __any_simple_seq(corba_any):
'value': []
}
for a in corba_any.value.value():
if ret['type'] == '':
ret['type'] = PropertyHelper.__corba_to_cf_type(a.value._t)
ret['value'].append(a.value.value())
if hasattr(a, 'value'):
# The item in the sequence is a CORBA type
if ret['type'] == '':
ret['type'] = PropertyHelper.__corba_to_cf_type(a.value._t)
ret['value'].append(a.value.value())
else:
# The item in the sequence is a Python type
if ret['type'] == '':
# Convert to CF type
aType = str(type(a))
if 'str' in aType:
ret['type'] = 'string'
elif ('int' in aType) or ('long' in aType):
ret['type'] = 'long'
elif 'float' in aType:
ret['type'] = 'double'
elif 'bool' in aType:
ret['type'] = 'boolean'
else:
ret['type'] = aType
ret['value'].append(a)
return ret

@staticmethod
Expand Down