From e7f2186f994f84e050b869559132d28d4fe26614 Mon Sep 17 00:00:00 2001 From: Chris Jerdonek Date: Fri, 7 Dec 2012 15:51:53 -0800 Subject: 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(). --- Misc/NEWS | 2 ++ Objects/bytesobject.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index 1f2687a..874e12a 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 a1db778..8d8cb05 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); } -- cgit v0.12