diff options
| author | Daniel Drake <dsd@laptop.org> | 2010-06-29 21:48:36 (GMT) |
|---|---|---|
| committer | Daniel Drake <dsd@laptop.org> | 2010-06-29 21:48:36 (GMT) |
| commit | d86e40b6f69820e0302d272c0fe110c6987246dc (patch) | |
| tree | 4a9d1d1ce8812be055baa26ff18d4f1f70baf643 | |
| parent | eb2dca526498533a8cbfd84a754e62f75b4b5980 (diff) | |
Fix use of sugar.util.sha_data
Use the 0.84+ function name.
| -rw-r--r-- | instance.py | 6 | ||||
| -rw-r--r-- | record.py | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/instance.py b/instance.py index d0178df..085c2da 100644 --- a/instance.py +++ b/instance.py @@ -10,11 +10,7 @@ import record class Instance: key = profile.get_pubkey() - if hasattr(util, '_sha_data'): - # sugar-0.82 and previous - keyHash = util._sha_data(key) - else: - keyHash = util.sha_data(key) + keyHash = util.sha_data(key) keyHashPrintable = util.printable_hash(keyHash) nickName = profile.get_nick_name() @@ -357,7 +357,7 @@ class Record(activity.Activity): buds = self._shared_activity.get_joined_buddies() for i in range (0, len(buds)): nextBudObj = buds[i] - nextBud = util._sha_data(nextBudObj.props.key) + nextBud = util.sha_data(nextBudObj.props.key) nextBud = util.printable_hash(nextBud) if (recd.triedMeshBuddies.count(nextBud) > 0): self.__class__.log.debug('mnrrb: weve already tried bud ' + str(nextBudObj.props.nick)) @@ -368,7 +368,7 @@ class Record(activity.Activity): if (goodBudObj != None): goodNick = goodBudObj.props.nick - goodBud = util._sha_data(goodBudObj.props.key) + goodBud = util.sha_data(goodBudObj.props.key) goodBud = util.printable_hash(goodBud) self.meshReqRecFromBuddy(recd, goodBud, goodNick) else: |