1. Armin Rigo
  2. cpython-withatomic

Commits

Michael W. Hudson  committed c0dd8bb

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.

  • Participants
  • Parent commits 5d38300
  • Branches 2.2

Comments (0)

Files changed (1)

File Python/pythonrun.c

View file
  • Ignore whitespace
 	/* Disable signal handling */
 	PyOS_FiniInterrupts();
 
-#ifdef Py_USING_UNICODE
-	/* Cleanup Unicode implementation */
-	_PyUnicode_Fini();
-#endif
-
 	/* Cleanup Codec registry */
 	_PyCodecRegistry_Fini();
 
 	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