From: Chris Jerdonek <chris.jerdonek@gmail.com>
Date: Fri, 7 Dec 2012 23:51:53 +0000 (-0800)
Subject: Issue #16495: remove extraneous NULL encoding check from bytes_decode().
X-Git-Tag: v3.4.0a1~1895
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7f2186f994f84e050b869559132d28d4fe26614;p=python

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

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
index 1f2687a12e..874e12aea2 100644
--- 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
index a1db7789f1..8d8cb05b11 100644
--- 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);
 }