Update --proxy examples to include URLs to work with Requests v2.0.0..

httpie · Sep 25, 2013 · 81c9988 · 81c9988
1 parent 2e535d8
commit 81c9988
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/README.rst b/README.rst
@@ -547,7 +547,7 @@ protocol (which is included in the value in case of redirects across protocols):
 
 .. code-block:: bash
 
-    $ http --proxy=http:10.10.1.10:3128 --proxy=https:10.10.1.10:1080 example.org
+    $ http --proxy=http:http://10.10.1.10:3128 --proxy=https:https://10.10.1.10:1080 example.org
 
 
 With Basic authentication:
@@ -565,8 +565,8 @@ In your ``~/.bash_profile``:
 
 .. code-block:: bash
 
- export HTTP_PROXY=10.10.1.10:3128
- export HTTPS_PROXY=10.10.1.10:1080
+ export HTTP_PROXY=http://10.10.1.10:3128
+ export HTTPS_PROXY=https://10.10.1.10:1080
  export NO_PROXY=localhost,example.com
 
 

diff --git a/httpie/cli.py b/httpie/cli.py
@@ -430,11 +430,12 @@ def _split_lines(self, text, width):
     '--proxy',
     default=[],
     action='append',
-    metavar='PROTOCOL:HOST',
+    metavar='PROTOCOL:PROXY_URL',
     type=KeyValueArgType(SEP_PROXY),
     help="""
-    String mapping protocol to the URL of the proxy (e.g. http:foo.bar:3128).
-    You can specify multiple proxies with different protocols.
+    String mapping protocol to the URL of the proxy
+    (e.g. http:http://foo.bar:3128). You can specify multiple proxies with
+    different protocols.
 
     """
 )