From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Wed, 1 Sep 2010 19:39:01 +0000 (+0000)
Subject: Remove unicode_default_encoding constant
X-Git-Tag: v3.2a2~90
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42cb4626820e466177e49c283e37e15375c3efed;p=python

Remove unicode_default_encoding constant

Inline its value in PyUnicode_GetDefaultEncoding(). The comment is now outdated
(we will not change its value anymore).
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 60124929cb..9cabd117ed 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -114,15 +114,6 @@ static PyUnicodeObject *unicode_empty;
    shared as well. */
 static PyUnicodeObject *unicode_latin1[256];
 
-/* Default encoding to use and assume when NULL is passed as encoding
-   parameter; it is fixed to "utf-8".  Always use the
-   PyUnicode_GetDefaultEncoding() API to access this global.
-
-   Don't forget to alter Py_FileSystemDefaultEncoding if you change the
-   hard coded default!
-*/
-static const char unicode_default_encoding[] = "utf-8";
-
 /* Fast detection of the most frequent whitespace characters */
 const unsigned char _Py_ascii_whitespace[] = {
     0, 0, 0, 0, 0, 0, 0, 0,
@@ -1781,7 +1772,7 @@ Py_ssize_t PyUnicode_GetSize(PyObject *unicode)
 
 const char *PyUnicode_GetDefaultEncoding(void)
 {
-    return unicode_default_encoding;
+    return "utf-8";
 }
 
 /* create or adjust a UnicodeDecodeError */