From: Michael W. Hudson <mwh@python.net>
Date: Mon, 8 Apr 2002 17:00:54 +0000 (+0000)
Subject: This may well be my final checkin before 2.2.1.
X-Git-Tag: v2.2.1~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f828b62979a14be030dbb21609610bd3ff3a64c;p=thirdparty%2FPython%2Fcpython.git

This may well be my final checkin before 2.2.1.

If you think I've forgotten something, now is a good
time to howl (although I won't read the howl for a good
few hours 'cause I'm going home).

backport lemburg's checkin of
    revision 2.158 of pythonrun.c

Move Unicode finalization further down in the chain.
Fixes bug #525620.
---

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index ad92004f9a5f..4b5cba585159 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -219,11 +219,6 @@ Py_Finalize(void)
 	/* Disable signal handling */
 	PyOS_FiniInterrupts();
 
-#ifdef Py_USING_UNICODE
-	/* Cleanup Unicode implementation */
-	_PyUnicode_Fini();
-#endif
-
 	/* Cleanup Codec registry */
 	_PyCodecRegistry_Fini();
 
@@ -268,6 +263,11 @@ Py_Finalize(void)
 	PyInt_Fini();
 	PyFloat_Fini();
 
+#ifdef Py_USING_UNICODE
+	/* Cleanup Unicode implementation */
+	_PyUnicode_Fini();
+#endif
+
 	/* XXX Still allocated:
 	   - various static ad-hoc pointers to interned strings
 	   - int and float free list blocks