/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/lockdir.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-18 02:13:57 UTC
  • mto: (6973.12.2 python3-k)
  • mto: This revision was merged to the branch mainline in revision 7004.
  • Revision ID: jelmer@jelmer.uk-20180618021357-xz802zqfmrf7zv1z
More test fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/lockdir.py
775
775
        info = dict(
776
776
            hostname=get_host_name(),
777
777
            pid=str(os.getpid()),
778
 
            nonce=rand_chars(20),
 
778
            nonce=rand_chars(20).encode('ascii'),
779
779
            start_time=str(int(time.time())),
780
780
            user=get_username_for_lock_info(),
781
781
            )
803
803
            # there may not be much we can say
804
804
            return cls({})
805
805
        else:
806
 
            return cls(stanza.as_dict())
 
806
            ret = stanza.as_dict()
 
807
            ret['nonce'] = ret['nonce'].encode('ascii')
 
808
            return cls(ret)
807
809
 
808
810
    def __hash__(self):
809
811
        return id(self)