~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/http/__init__.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) 2005-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
154
154
                                 None, None, self._host, self._port, path)
155
155
 
156
156
    def _create_auth(self):
157
 
        """Returns a dict returning the credentials provided at build time."""
 
157
        """Returns a dict containing the credentials provided at build time."""
158
158
        auth = dict(host=self._host, port=self._port,
159
159
                    user=self._user, password=self._password,
160
160
                    protocol=self._unqualified_scheme,