Skip to content

Commit

Permalink
Merge branch 'release/0.5.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
xeroc committed Sep 4, 2017
2 parents 35940cf + 4468758 commit 542ebf1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions graphenebase/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def __init__(self, d):
super().__init__(d)

def __str__(self):
return True if self.data else False
return json.dumps(True) if self.data else json.dumps(False)


class Set(Array): # Set = Array
Expand Down Expand Up @@ -382,9 +382,9 @@ def __init__(self, selection):
"Options are %s. Given '%s'" % (
self.options, selection)
if selection in self.options:
super(Enum, self).__init__(self.options.index(selection))
super(Enum8, self).__init__(self.options.index(selection))
else:
super(Enum, self).__init__(selection)
super(Enum8, self).__init__(selection)

def __str__(self):
return str(self.options[self.data])
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
ascii = codecs.lookup('ascii')
codecs.register(lambda name, enc=ascii: {True: enc}.get(name == 'mbcs'))

VERSION = '0.5.3'
VERSION = '0.5.4'

setup(
name='graphenelib',
Expand Down

0 comments on commit 542ebf1

Please sign in to comment.