← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/medium.py

  • Committer: Martin Pool
  • Date: 2007-04-24 05:02:04 UTC
  • mfrom: (2449 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2450.
  • Revision ID: mbp@sourcefrog.net-20070424050204-bfkc1qiq0axt5f14
Merge trunk & fix NEWS conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/medium.py
1
 
# Copyright (C) 2006,2007 Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
27
27
import os
28
28
import socket
29
29
import sys
 
30
 
30
31
from bzrlib import errors
31
 
from bzrlib.smart.protocol import SmartServerRequestProtocolOne
32
 
 
 
32
from bzrlib.smart import protocol
33
33
try:
34
34
    from bzrlib.transport import ssh
35
35
except errors.ParamikoNotPresent:
66
66
        from sys import stderr
67
67
        try:
68
68
            while not self.finished:
69
 
                protocol = SmartServerRequestProtocolOne(self.backing_transport,
70
 
                                                         self._write_out)
71
 
                self._serve_one_request(protocol)
 
69
                server_protocol = protocol.SmartServerRequestProtocolOne(
 
70
                    self.backing_transport, self._write_out)
 
71
                self._serve_one_request(server_protocol)
72
72
        except Exception, e:
73
73
            stderr.write("%s terminating on exception %s\n" % (self, e))
74
74
            raise
523
523
        """
524
524
        return self._medium._read_bytes(count)
525
525
 
526