Mercurial > cpython-lru_cache-weakref
diff Python/pythonrun.c @ 41587:15b810e21fe9
Get rid of all #ifdef Py_USING_UNICODE (it is always present now).
(With the help of unifdef from freshmeat.)
| author | Guido van Rossum <guido@python.org> |
|---|---|
| date | Thu, 03 May 2007 17:49:24 +0000 |
| parents | 29ae667f3239 |
| children | cd125fe83051 |
line wrap: on
line diff
--- a/Python/pythonrun.c Thu May 03 17:22:56 2007 +0000 +++ b/Python/pythonrun.c Thu May 03 17:49:24 2007 +0000 @@ -152,7 +152,7 @@ PyThreadState *tstate; PyObject *bimod, *sysmod; char *p; -#if defined(Py_USING_UNICODE) && defined(HAVE_LANGINFO_H) && defined(CODESET) +#if defined(HAVE_LANGINFO_H) && defined(CODESET) char *codeset; char *saved_locale; PyObject *sys_stream, *sys_isatty; @@ -199,10 +199,8 @@ if (interp->modules_reloading == NULL) Py_FatalError("Py_Initialize: can't make modules_reloading dictionary"); -#ifdef Py_USING_UNICODE /* Init Unicode implementation; relies on the codec registry */ _PyUnicode_Init(); -#endif bimod = _PyBuiltin_Init(); if (bimod == NULL) @@ -250,7 +248,7 @@ if (!warnings_module) PyErr_Clear(); -#if defined(Py_USING_UNICODE) && defined(HAVE_LANGINFO_H) && defined(CODESET) +#if defined(HAVE_LANGINFO_H) && defined(CODESET) /* On Unix, set the file system encoding according to the user's preference, if the CODESET names a well-known Python codec, and Py_FileSystemDefaultEncoding isn't @@ -468,10 +466,8 @@ PyLong_Fini(); PyFloat_Fini(); -#ifdef Py_USING_UNICODE /* Cleanup Unicode implementation */ _PyUnicode_Fini(); -#endif /* XXX Still allocated: - various static ad-hoc pointers to interned strings