diff options
| author | Guido van Rossum <guido@python.org> | 2007-05-03 17:49:24 +0000 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-05-03 17:49:24 +0000 |
| commit | 6c65ec444727759ae588da57f182d678e813086e (patch) | |
| tree | c91670f353805c54b6971c01ddbef6380b6e9b99 /Python/pythonrun.c | |
| parent | 69c364b09b9bb97a9f4e51adb3f549cdc29e1d7c (diff) | |
| download | cpython-6c65ec444727759ae588da57f182d678e813086e.tar.gz | |
Get rid of all #ifdef Py_USING_UNICODE (it is always present now).
(With the help of unifdef from freshmeat.)
Diffstat (limited to 'Python/pythonrun.c')
| -rw-r--r-- | Python/pythonrun.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 3d16ba5b66..c2005f1baf 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -152,7 +152,7 @@ Py_InitializeEx(int install_sigs) 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 @@ Py_InitializeEx(int install_sigs) 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 @@ Py_InitializeEx(int install_sigs) 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 @@ Py_Finalize(void) 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 |