From 1f828b62979a14be030dbb21609610bd3ff3a64c Mon Sep 17 00:00:00 2001 From: "Michael W. Hudson" Date: Mon, 8 Apr 2002 17:00:54 +0000 Subject: 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. --- Python/pythonrun.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Python/pythonrun.c b/Python/pythonrun.c index ad92004..4b5cba5 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 -- cgit v0.12