Skip to content

Commit

Permalink
Merge branch 'release/0.7.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
dan-blanchard committed Jan 6, 2014
2 parents 2ae54b2 + 6dfe23d commit c65eca5
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ License
Changelog
~~~~~~~~~

- v0.7.6

- Fix a typo in ``DictAttribute`` that was causing a crash.

- v0.7.5

- Fix an issue where dictionary attributes (like ``jtEnvironment``) could
Expand Down
6 changes: 3 additions & 3 deletions drmaa/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,15 +200,15 @@ def __init__(self, name):
self.name = name

def __set__(self, instance, value):
v = []
vector = []
for k, v in value.items():
if isinstance(k, bytes):
k = k.decode(ENCODING)
if isinstance(v, bytes):
v = v.decode(ENCODING)
v.append("{0}={1}".format(k, v).encode(ENCODING))
vector.append("{0}={1}".format(k, v).encode(ENCODING))
c(drmaa_set_vector_attribute, instance, self.name,
string_vector(v))
string_vector(vector))

def __get__(self, instance, _):
x = [i.split('=', 1) for i in
Expand Down
2 changes: 1 addition & 1 deletion drmaa/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
:author: Dan Blanchard ([email protected])
'''

__version__ = '0.7.5'
__version__ = '0.7.6'
VERSION = tuple(int(x) for x in __version__.split('.'))

0 comments on commit c65eca5

Please sign in to comment.