Merged revisions 55342-55406 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
........
r55360 | guido.van.rossum | 2007-05-15 14:57:59 -0700 (Tue, 15 May 2007) | 2 lines
obcheckin.
........
r55361 | guido.van.rossum | 2007-05-15 14:59:18 -0700 (Tue, 15 May 2007) | 2 lines
Get rid of strop module.
........
r55367 | brett.cannon | 2007-05-15 21:06:28 -0700 (Tue, 15 May 2007) | 2 lines
Remove the 'pure' module.
........
r55369 | brett.cannon | 2007-05-15 21:07:31 -0700 (Tue, 15 May 2007) | 2 lines
Remove the lib-old directory (already empty).
........
r55370 | neal.norwitz | 2007-05-15 21:30:40 -0700 (Tue, 15 May 2007) | 1 line
Get rid of a bunch more references to strop
........
r55374 | brett.cannon | 2007-05-15 21:39:00 -0700 (Tue, 15 May 2007) | 2 lines
Complete the removal of IRIX-specific modules.
........
r55379 | brett.cannon | 2007-05-15 22:31:54 -0700 (Tue, 15 May 2007) | 2 lines
Update removed IRIX modules based on what is gone from removing plat-irix6.
........
r55388 | brett.cannon | 2007-05-16 14:34:52 -0700 (Wed, 16 May 2007) | 2 lines
Clean up the docstring for the compiler resource.
........
r55406 | brett.cannon | 2007-05-17 11:05:37 -0700 (Thu, 17 May 2007) | 2 lines
Remove BaseException.message (deprecated in Python 2.6).
........
diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c
index b448be1..6f063fb 100644
--- a/Modules/_localemodule.c
+++ b/Modules/_localemodule.c
@@ -96,21 +96,18 @@
static void
fixup_ulcase(void)
{
- PyObject *mods, *strop, *string, *ulo;
+ PyObject *mods, *string, *ulo;
unsigned char ul[256];
int n, c;
- /* find the string and strop modules */
+ /* find the string module */
mods = PyImport_GetModuleDict();
if (!mods)
return;
string = PyDict_GetItemString(mods, "string");
if (string)
string = PyModule_GetDict(string);
- strop=PyDict_GetItemString(mods, "strop");
- if (strop)
- strop = PyModule_GetDict(strop);
- if (!string && !strop)
+ if (!string)
return;
/* create uppercase map string */
@@ -124,8 +121,6 @@
return;
if (string)
PyDict_SetItemString(string, "uppercase", ulo);
- if (strop)
- PyDict_SetItemString(strop, "uppercase", ulo);
Py_DECREF(ulo);
/* create lowercase string */
@@ -139,8 +134,6 @@
return;
if (string)
PyDict_SetItemString(string, "lowercase", ulo);
- if (strop)
- PyDict_SetItemString(strop, "lowercase", ulo);
Py_DECREF(ulo);
/* create letters string */