← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to tools/win32/bzr_postinstall.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:
tools/win32/bzr_postinstall.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010 by Canonical Ltd
 
1
# Copyright (C) 2005 by 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
173
173
                content[ix] = s.replace('bzr.exe',
174
174
                                        '"%s"' % os.path.join(bzr_dir,
175
175
                                                              'bzr.exe'))
176
 
            elif s.find(r'C:\Program Files\Bazaar') != -1:
177
 
                content[ix] = s.replace(r'C:\Program Files\Bazaar',
178
 
                                        bzr_dir)
179
176
 
180
177
        if dry_run:
181
178
            print "*** Write file: start_bzr.bat"
344
341
                         "this library manually and put it to directory\n"
345
342
                         "where Bzr installed.\n"
346
343
                         "For detailed instructions see:\n"
347
 
                         "http://wiki.bazaar.canonical.com/BzrOnPureWindows"
 
344
                         "http://bazaar-vcs.org/BzrOnPureWindows"
348
345
                        ),
349
346
                        "Warning",
350
347
                        MB_OK | MB_ICONEXCLAMATION)