Skip to content

Fix issue where string_vector dies when given an int #57

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
Jul 3, 2017
Merged

Fix issue where string_vector dies when given an int #57

Show file tree
Hide file tree
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
8 changes: 6 additions & 2 deletions drmaa/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ def adapt_rusage(rusage):
"""
rv = dict()
for attr in attributes_iterator(rusage.contents):

k, v = attr.split('=',1)
rv[k] = v
return rv
Expand Down Expand Up @@ -307,7 +307,11 @@ def string_vector(v):
vlen = len(v)
values = (STRING * (vlen + 1))()
for i, el in enumerate(v):
values[i] = STRING(el.encode(ENCODING) if isinstance(el, str) else el)
if isinstance(el, str):
el = el.encode(ENCODING)
elif not isinstance(el, bytes):
el = str(el).encode(ENCODING)
values[i] = STRING(el)
values[vlen] = STRING()
return values

Expand Down
4 changes: 2 additions & 2 deletions test/testwrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,9 @@ def xtest_tmp(self):

def test_vector_attributes(self):
"""vector attributes work"""
args = ['10', 'de', 'arglebargle']
args = [10, 'de', 'arglebargle']
self.jt.args = args
eq_(self.jt.args, args)
eq_(self.jt.args, ['10', 'de', 'arglebargle'])
em = ['[email protected]', '[email protected]']
self.jt.email = em
eq_(self.jt.email, em)
Expand Down