Remove optional 'utf-8' argument from encode/decode

Author: Roma Koshel

chef/api.py

@@ -202,7 +202,7 @@ def __exit__(self, type, value, traceback):
     def _request(self, method, url, data, headers):
         # Testing hook, subclass and override for WSGI intercept
         if six.PY3 and data:
-            data = data.encode('utf-8')
+            data = data.encode()
         request = ChefRequest(url, data, headers, method=method)
         return six.moves.urllib.request.urlopen(request).read()
 
@@ -222,7 +222,7 @@ def request(self, method, path, headers={}, data=None):
         except six.moves.urllib.error.HTTPError as e:
             e.content = e.read()
             try:
-                e.content = json.loads(e.content.decode("utf-8"))
+                e.content = json.loads(e.content.decode())
                 raise ChefServerError.from_error(e.content['error'], code=e.code)
             except ValueError:
                 pass
@@ -236,7 +236,7 @@ def api_request(self, method, path, headers={}, data=None):
             headers['content-type'] = 'application/json'
             data = json.dumps(data)
         response = self.request(method, path, headers, data)
-        return json.loads(response.decode('utf-8'))
+        return json.loads(response.decode())
 
     def __getitem__(self, path):
         return self.api_request('GET', path)

chef/rsa.py

@@ -152,7 +152,7 @@ def __init__(self, fp=None):
         self.public = False
         if not fp:
             return
-        if isinstance(fp, six.binary_type) and fp.startswith('-----'.encode('utf-8')):
+        if isinstance(fp, six.binary_type) and fp.startswith('-----'.encode()):
             # PEM formatted text
             self.raw = fp
         elif isinstance(fp, six.string_types):
@@ -190,7 +190,7 @@ def private_encrypt(self, value, padding=RSA_PKCS1_PADDING):
         if self.public:
             raise SSLError('private method cannot be used on a public key')
         if six.PY3 and not isinstance(value, bytes):
-            buf = create_string_buffer(bytes(value, encoding='utf-8'), len(value))
+            buf = create_string_buffer(value.encode(), len(value))
         else:
             buf = create_string_buffer(value, len(value))
         size = RSA_size(self.key)
@@ -202,7 +202,7 @@ def private_encrypt(self, value, padding=RSA_PKCS1_PADDING):
 
     def public_decrypt(self, value, padding=RSA_PKCS1_PADDING):
         if six.PY3 and not isinstance(value, bytes):
-            buf = create_string_buffer(bytes(value, encoding='utf-8'), len(value))
+            buf = create_string_buffer(value.encode(), len(value))
         else:
             buf = create_string_buffer(value, len(value))
         size = RSA_size(self.key)
@@ -211,7 +211,7 @@ def public_decrypt(self, value, padding=RSA_PKCS1_PADDING):
         if ret <= 0:
             raise SSLError('Unable to decrypt data')
         if six.PY3 and isinstance(output.raw, bytes):
-            return str(output.raw[:ret], encoding='utf-8')
+            return output.raw[:ret].decode()
         else:
             return output.raw[:ret]