~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/http/_urllib.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2006-2010 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
87
87
            self._update_credentials((request.auth, request.proxy_auth))
88
88
 
89
89
        code = response.code
90
 
        if request.follow_redirections is False \
91
 
                and code in (301, 302, 303, 307):
 
90
        if (request.follow_redirections is False
 
91
            and code in (301, 302, 303, 307)):
92
92
            raise errors.RedirectRequested(request.get_full_url(),
93
93
                                           request.redirected_to,
94
94
                                           is_permanent=(code == 301))