Merge branch 'master' into appveyor

This commit is contained in:
Jack 2016-08-29 13:46:08 -04:00
commit c3633895d0
4 changed files with 5 additions and 5 deletions

View file

@ -1,5 +1,5 @@
[bumpversion] [bumpversion]
current_version = 0.4.0 current_version = 0.4.1
commit = True commit = True
tag = True tag = True

View file

@ -1,2 +1,2 @@
__version__ = "0.4.0" __version__ = "0.4.1"
version = tuple(__version__.split('.')) version = tuple(__version__.split('.'))

View file

@ -431,10 +431,10 @@ class LBRYWallet(object):
def _claim_or_update(claim, metadata, _bid): def _claim_or_update(claim, metadata, _bid):
if not claim: if not claim:
log.info("No claim yet, making a new one") log.info("No claim yet, making a new one")
return self._send_name_claim(name, metadata.as_json(), _bid) return self._send_name_claim(name, json.dumps(metadata), _bid)
if not claim['is_mine']: if not claim['is_mine']:
log.info("Making a contesting claim") log.info("Making a contesting claim")
return self._send_name_claim(name, metadata.as_json(), _bid) return self._send_name_claim(name, json.dump(metadata), _bid)
else: else:
log.info("Updating over own claim") log.info("Updating over own claim")
d = self.update_metadata(metadata, claim['value']) d = self.update_metadata(metadata, claim['value'])

View file

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Version=0.4.0 Version=0.4.1
Name=LBRY Name=LBRY
Comment=The world's first user-owned content marketplace Comment=The world's first user-owned content marketplace
Icon=lbry Icon=lbry