Skip to content

Commit

Permalink
Merge pull request #10951 from gpchelkin/proxy_scheme2
Browse files Browse the repository at this point in the history
  • Loading branch information
pradyunsg authored Mar 11, 2022
2 parents c679319 + 57b69c6 commit 0561ab2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docs/html/user_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ in many corporate environments requires an outbound HTTP proxy server.
pip can be configured to connect through a proxy server in various ways:

* using the ``--proxy`` command-line option to specify a proxy in the form
``[user:passwd@]proxy.server:port``
``scheme://[user:passwd@]proxy.server:port``
* using ``proxy`` in a :ref:`config-file`
* by setting the standard environment-variables ``http_proxy``, ``https_proxy``
and ``no_proxy``.
Expand Down
1 change: 1 addition & 0 deletions news/10951.doc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add ``scheme://`` requirement to ``--proxy`` option's description
2 changes: 1 addition & 1 deletion src/pip/_internal/cli/cmdoptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ class PipOption(Option):
dest="proxy",
type="str",
default="",
help="Specify a proxy in the form [user:passwd@]proxy.server:port.",
help="Specify a proxy in the form scheme://[user:passwd@]proxy.server:port.",
)

retries: Callable[..., Option] = partial(
Expand Down

0 comments on commit 0561ab2

Please sign in to comment.