← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/nosmart.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-10 16:25:28 UTC
  • mfrom: (5020.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100210162528-00g29u0ex6vzv914
(gerard) Update performs two merges in a more logical order but stop
        on conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/nosmart.py
22
22
"""
23
23
 
24
24
from bzrlib import errors
25
 
from bzrlib.transport import decorator
26
 
 
27
 
 
28
 
class NoSmartTransportDecorator(decorator.TransportDecorator):
 
25
from bzrlib.transport.decorator import TransportDecorator, DecoratorServer
 
26
 
 
27
 
 
28
class NoSmartTransportDecorator(TransportDecorator):
29
29
    """A decorator for transports that disables get_smart_medium."""
30
30
 
31
31
    @classmethod
36
36
        raise errors.NoSmartMedium(self)
37
37
 
38
38
 
 
39
class NoSmartTransportServer(DecoratorServer):
 
40
    """Server for the NoSmartTransportDecorator for testing with."""
 
41
 
 
42
    def get_decorator_class(self):
 
43
        return NoSmartTransportDecorator
 
44
 
 
45
 
39
46
def get_test_permutations():
40
47
    """Return the permutations to be used in testing."""
41
 
    from bzrlib.tests import test_server
42
 
    return [(NoSmartTransportDecorator, test_server.NoSmartTransportServer)]
 
48
    return [(NoSmartTransportDecorator, NoSmartTransportServer)]
43
49