← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/medium.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/medium.py
37
37
    SmartServerRequestProtocolOne,
38
38
    SmartServerRequestProtocolTwo,
39
39
    )
40
 
 
41
 
try:
42
 
    from bzrlib.transport import ssh
43
 
except errors.ParamikoNotPresent:
44
 
    # no paramiko.  SmartSSHClientMedium will break.
45
 
    pass
 
40
from bzrlib.transport import ssh
46
41
 
47
42
 
48
43
class SmartServerStreamMedium(object):