Merge pull request ywangd#402 from onyxware/dev

Add new option to CURL

Author: bennr01

bin/curl.py

@@ -6,15 +6,12 @@
 import argparse
 import requests
 
-try:
-    from urllib.parse import urlparse
-except ImportError:
-    from urlparse import urlparse
+from six.moves.urllib.parse import urlparse
 
 try:
     import clipboard
 except ImportError:
-    pass
+    clipboard = None
 
 
 def main(args):
@@ -27,6 +24,12 @@ def main(args):
         action='store_true',
         help='write output to a local file named like the remote file we get'
     )
+    ap.add_argument(
+        '-L',
+        '--location',
+        action='store_true',
+        help='follow redirects to other web pages (if the URL has a 3XX response code)'
+    )
     ap.add_argument(
         '-X',
         '--request-method',
@@ -49,11 +52,24 @@ def main(args):
             headers[name.strip()] = value.strip()
 
     if ns.request_method == 'GET':
-        r = requests.get(url, headers=headers)
+        r = requests.get(
+            url,
+            headers=headers,
+            allow_redirects=ns.location
+        )
     elif ns.request_method == 'POST':
-        r = requests.post(url, data=ns.data, headers=headers)
+        r = requests.post(
+            url,
+            data=ns.data,
+            headers=headers,
+            allow_redirects=ns.location
+        )
     elif ns.request_method == 'HEAD':
-        r = requests.head(url, headers=headers)
+        r = requests.head(
+            url,
+            headers=headers,
+            allow_redirects=ns.location
+        )
     else:
         print('unknown request method: {}'.format(ns.request_method))
         return