/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 bzrlib/smart/protocol.py

  • Committer: Andrew Bennetts
  • Date: 2010-03-05 07:27:58 UTC
  • mto: This revision was merged to the branch mainline in revision 5117.
  • Revision ID: andrew.bennetts@canonical.com-20100305072758-9il5cvpa4gjo8tba
Try a bit harder to stop a SmartTCPServer sooner when _should_terminate has been set.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/protocol.py
64
64
    """Encode the tuple args to a bytestream."""
65
65
    joined = '\x01'.join(args) + '\n'
66
66
    if type(joined) is unicode:
67
 
        # XXX: We should fix things so this never happens!  -AJB, 20100304
 
67
        # XXX: We should fix things so this never happens!  -AJB, 04032010.
68
68
        mutter('response args contain unicode, should be only bytes: %r',
69
69
               joined)
70
70
        joined = joined.encode('ascii')