← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inter.py

  • Committer: Vincent Ladeuil
  • Date: 2009-05-04 14:48:21 UTC
  • mto: (4349.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4350.
  • Revision ID: v.ladeuil+lp@free.fr-20090504144821-39dvqkikmd3zqkdg
Handle servers proposing several authentication schemes.

* bzrlib/transport/http/_urllib2_wrappers.py:
(AbstractAuthHandler.auth_required): Several schemes can be
proposed by the server, try to match each one in turn.
(BasicAuthHandler.auth_match): Delete dead code.

* bzrlib/tests/test_http.py:
(load_tests): Separate proxy and http authentication tests as they
require different server setups.
(TestAuth.create_transport_readonly_server): Simplified by using
parameter provided by load_tests.
(TestAuth.test_changing_nonce): Adapt to new parametrization.
(TestProxyAuth.create_transport_readonly_server): Deleted.

* bzrlib/tests/http_utils.py:
(DigestAndBasicAuthRequestHandler, HTTPBasicAndDigestAuthServer,
ProxyBasicAndDigestAuthServer): Add a test server proposing both
basic and digest auth schemes but accepting only digest as valid.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inter.py
18
18
"""Inter-object utility class."""
19
19
 
20
20
 
21
 
from bzrlib.errors import NoCompatibleInter
22
 
 
23
 
 
24
21
class InterObject(object):
25
22
    """This class represents operations taking place between two objects.
26
23
 
78
75
                       the InterObject instance.
79
76
        :param target: the object to be the 'target' member of
80
77
                       the InterObject instance.
81
 
 
82
78
        If an optimised worker exists it will be used otherwise
83
79
        a default Inter worker instance will be created.
84
80
        """
85
81
        for provider in reversed(klass._optimisers):
86
82
            if provider.is_compatible(source, target):
87
83
                return provider(source, target)
88
 
        raise NoCompatibleInter(source, target)
 
84
        return klass(source, target)
89
85
 
90
86
    def lock_read(self):
91
87
        """Take out a logical read lock.