Upcase method only from CLI

- Remove upcasing method at connection level

Author: kracekumar

hyper/cli.py

@@ -195,6 +195,7 @@ def set_request_data(args):
     if args.method is None:
         args.method = 'POST' if args.body else 'GET'
 
+    args.method = args.method.upper()
     args.headers = headers
 
 

hyper/common/connection.py

@@ -99,9 +99,8 @@ def request(self, method, url, body=None, headers=None):
         headers = headers or {}
 
         try:
-            upcased_method = method.upper()
             return self._conn.request(
-                method=upcased_method, url=url, body=body, headers=headers
+                method=method, url=url, body=body, headers=headers
             )
         except TLSUpgrade as e:
             # We upgraded in the NPN/ALPN handshake. We can just go straight to

hyper/http11/connection.py

@@ -153,7 +153,6 @@ def request(self, method, url, body=None, headers=None):
         headers = headers or {}
 
         method = to_bytestring(method)
-        upcased_method = method.upper()
         url = to_bytestring(url)
 
         if not isinstance(headers, HTTPHeaderMap):
@@ -181,7 +180,7 @@ def request(self, method, url, body=None, headers=None):
             headers[b'host'] = self.host
 
         # Begin by emitting the header block.
-        self._send_headers(upcased_method, url, headers)
+        self._send_headers(method, url, headers)
 
         # Next, send the request body.
         if body:

hyper/http20/connection.py

@@ -235,7 +235,6 @@ def request(self, method, url, body=None, headers=None):
         :returns: A stream ID for the request.
         """
         headers = headers or {}
-        upcased_method = method.upper()
         # Concurrency
         #
         # It's necessary to hold a lock while this method runs to satisfy H2
@@ -248,7 +247,7 @@ def request(self, method, url, body=None, headers=None):
         # being sent in the wrong order, which can lead to the out-of-order
         # messages with lower stream IDs being closed prematurely.
         with self._write_lock:
-            stream_id = self.putrequest(upcased_method, url)
+            stream_id = self.putrequest(method, url)
 
             default_headers = (':method', ':scheme', ':authority', ':path')
             for name, value in headers.items():

test/test_abstraction.py

@@ -38,13 +38,6 @@ def test_h2_kwargs(self):
             'other_kwarg': True,
         }
 
-    def test_get_method_with_lower_case(self):
-        conn = HTTPConnection('http2bin.org:443')
-        conn.request('get', '/get')
-        resp = conn.get_response()
-
-        assert resp.status == 200
-
     def test_tls_upgrade(self, monkeypatch):
         monkeypatch.setattr(
             hyper.common.connection, 'HTTP11Connection', DummyH1Connection

test/test_cli.py

@@ -104,6 +104,7 @@ def test_cli_with_system_exit(argv):
 
 @pytest.mark.parametrize(('argv', 'expected'), [
     (['--debug', 'example.com'], {'debug': True}),
+    (['get', 'example.com'], {'method': 'GET'}),
     (['GET', 'example.com', 'x-test:header'],
      {'method': 'GET', 'headers': {'x-test': 'header'}}),
     (['GET', 'example.com', 'param==test'],
@@ -119,6 +120,7 @@ def test_cli_with_system_exit(argv):
                             'x-test': 'header'}}),
 ], ids=[
     'specified "--debug" option',
+    'specify host with lower get method',
     'specified host and additional header',
     'specified host and get parameter',
     'specified host and post data',

test/test_http11.py

@@ -128,25 +128,6 @@ def test_basic_request(self):
 
         assert received == expected
 
-    def test_basic_request_with_lower_case_method(self):
-        c = HTTP11Connection('httpbin.org')
-        c._sock = sock = DummySocket()
-
-        c.request('get', '/get', headers={'User-Agent': 'hyper'})
-
-        expected = (
-            b"GET /get HTTP/1.1\r\n"
-            b"User-Agent: hyper\r\n"
-            b"connection: Upgrade, HTTP2-Settings\r\n"
-            b"upgrade: h2c\r\n"
-            b"HTTP2-Settings: AAQAAP__\r\n"
-            b"host: httpbin.org\r\n"
-            b"\r\n"
-        )
-        received = b''.join(sock.queue)
-
-        assert received == expected
-
     def test_iterable_header(self):
         c = HTTP11Connection('httpbin.org')
         c._sock = sock = DummySocket()

test/test_hyper.py

@@ -89,15 +89,6 @@ def test_putrequest_establishes_new_stream(self):
         assert len(c.streams) == 1
         assert c.recent_stream is stream
 
-    def test_putrequest_establishes_new_stream_with_lower_case_method(self):
-        c = HTTP20Connection("www.google.com")
-
-        stream_id = c.putrequest('get', '/')
-        stream = c.streams[stream_id]
-
-        assert len(c.streams) == 1
-        assert c.recent_stream is stream
-
     def test_putrequest_autosets_headers(self):
         c = HTTP20Connection("www.google.com")