Changed to fix charset=utf-8 for application/json

Fixed to be able to run both py27 and py3

Author: t2y

hyper/cli.py

@@ -16,7 +16,7 @@
 
 from hyper import HTTP20Connection
 from hyper import __version__
-from hyper.compat import urlencode, urlsplit
+from hyper.compat import is_py2, urlencode, urlsplit, write_to_stdout
 
 
 log = logging.getLogger('hyper')
@@ -161,13 +161,16 @@ def set_request_data(args):
         elif i.sep == SEP_QUERY:
             params[i.key] = i.value
         elif i.sep == SEP_DATA:
-            body[i.key] = i.value
+            value = i.value
+            if is_py2:  # pragma: no cover
+                value = value.decode(PREFERRED_ENCODING)
+            body[i.key] = value
 
     if params:
         args.url.path += '?' + urlencode(params)
 
     if body:
-        content_type = 'application/json; charset=%s' % PREFERRED_ENCODING
+        content_type = 'application/json; charset=utf-8'
         headers.setdefault('content-type', content_type)
         args.body = json.dumps(body)
 
@@ -226,9 +229,7 @@ def main(argv=None):
     args = parse_argument(argv)
     log.debug('Commandline Argument: %s', args)
     data = request(args)
-    sys.stdout.buffer.write(data.encode(PREFERRED_ENCODING, errors='replace'))
-    sys.stdout.buffer.write(b'\n')
-    sys.stdout.buffer.flush()
+    write_to_stdout(data.encode(PREFERRED_ENCODING, errors='replace'))
 
 
 if __name__ == '__main__':  # pragma: no cover

hyper/compat.py

@@ -43,6 +43,10 @@ def to_byte(char):
     def decode_hex(b):
         return b.decode('hex')
 
+    def write_to_stdout(data):
+        sys.stdout.write(data + '\n')
+        sys.stdout.flush()
+
     # The standard zlib.compressobj() accepts only positional arguments.
     def zlib_compressobj(level=6, method=zlib.DEFLATED, wbits=15, memlevel=8,
                          strategy=zlib.Z_DEFAULT_STRATEGY):
@@ -57,6 +61,10 @@ def to_byte(char):
     def decode_hex(b):
         return bytes.fromhex(b)
 
+    def write_to_stdout(data):
+        sys.stdout.buffer.write(data + b'\n')
+        sys.stdout.buffer.flush()
+
     zlib_compressobj = zlib.compressobj
 
     if is_py3_3:

test/test_cli.py

@@ -3,7 +3,7 @@
 
 import pytest
 
-from hyper.cli import PREFERRED_ENCODING as PENC, KeyValue
+from hyper.cli import KeyValue
 from hyper.cli import get_content_type_and_charset, main, parse_argument
 from hyper.cli import set_request_data, set_url_info
 
@@ -155,7 +155,7 @@ def test_get_content_type_and_charset(response, expected):
                 KeyValue('data2', 'test2', '=', ''),
             ]}
         ),
-        {'headers': {'content-type': 'application/json; charset=%s' % PENC},
+        {'headers': {'content-type': 'application/json; charset=utf-8'},
          'method': 'POST',
          'body': json.dumps({'data1': 'test1', 'data2': 'test2'}),
          }