← 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 Packman
  • Date: 2012-01-05 10:44:12 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105104412-z03fi9m43h946fvs
Merge bzr.dev to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/medium.py
24
24
bzrlib/transport/smart/__init__.py.
25
25
"""
26
26
 
 
27
from __future__ import absolute_import
 
28
 
27
29
import errno
28
30
import os
29
31
import sys
41
43
    debug,
42
44
    errors,
43
45
    trace,
 
46
    transport,
44
47
    ui,
45
48
    urlutils,
46
49
    )
1019
1022
            raise AssertionError(
1020
1023
                "Unexpected io_kind %r from %r"
1021
1024
                % (io_kind, self._ssh_connection))
 
1025
        for hook in transport.Transport.hooks["post_connect"]:
 
1026
            hook(self)
1022
1027
 
1023
1028
    def _flush(self):
1024
1029
        """See SmartClientStreamMedium._flush()."""
1127
1132
            raise errors.ConnectionError("failed to connect to %s:%d: %s" %
1128
1133
                    (self._host, port, err_msg))
1129
1134
        self._connected = True
 
1135
        for hook in transport.Transport.hooks["post_connect"]:
 
1136
            hook(self)
1130
1137
 
1131
1138
 
1132
1139
class SmartClientAlreadyConnectedSocketMedium(SmartClientSocketMedium):