Issue #16495: remove extraneous NULL encoding check from bytes_decode().

cjerdonek · cjerdonek · commit e7f2186f994f · 2012-12-07T15:51:53.000-08:00
The NULL encoding check in bytes_decode() was unnecessary because this case
is already taken care of by the call to _Py_normalize_encoding() inside
PyUnicode_Decode().
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,8 @@ What's New in Python 3.4.0 Alpha 1?
 Core and Builtins
 -----------------
 
+- Issue #16495: Remove extraneous NULL encoding check from bytes_decode().
+
 - Issue #16619: Create NameConstant AST class to represent None, True, and False
   literals. As a result, these constants are never loaded at runtime from
   builtins.
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
@@ -2236,8 +2236,6 @@ bytes_decode(PyObject *self, PyObject *args, PyObject *kwargs)
 
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|ss:decode", kwlist, &encoding, &errors))
         return NULL;
-    if (encoding == NULL)
-        encoding = PyUnicode_GetDefaultEncoding();
     return PyUnicode_FromEncodedObject(self, encoding, errors);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2236,8 +2236,6 @@ bytes_decode(PyObject self, PyObject args, PyObject *kwargs)`
`2236`	`2236`
`2237`	`2237`	`if (!PyArg_ParseTupleAndKeywords(args, kwargs, "\|ss:decode", kwlist, &encoding, &errors))`
`2238`	`2238`	`return NULL;`
`2239`		`- if (encoding == NULL)`
`2240`		`- encoding = PyUnicode_GetDefaultEncoding();`
`2241`	`2239`	`return PyUnicode_FromEncodedObject(self, encoding, errors);`
`2242`	`2240`	`}`
`2243`	`2241`