Move Unicode finalization further down in the chain.

Fixes bug #525620.

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index b22009db17261fe5db93b97000d105ea23a6d13c..f0727d3f5b37797a20ad3607fa8b193f7cf8bb0a 100644 (file)
--- 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