diff options
author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2010-09-12 22:42:57 +0000 |
---|---|---|
committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2010-09-12 22:42:57 +0000 |
commit | feb7307db4b4582af9ac01719f7df651c2eed077 (patch) | |
tree | fdf12671ce7ea77718886f4ee73370ab8b19c490 /Objects | |
parent | b2f98401d123b940b282777b8e435f4a9ea0c085 (diff) | |
download | cpython-git-feb7307db4b4582af9ac01719f7df651c2eed077.tar.gz |
#9210: remove --with-wctype-functions configure option.
The internal unicode database is now always used.
(after 5 years: see
http://mail.python.org/pipermail/python-dev/2004-December/050193.html
)
Diffstat (limited to 'Objects')
-rw-r--r-- | Objects/unicodectype.c | 33 | ||||
-rw-r--r-- | Objects/unicodetype_db.h | 4 |
2 files changed, 0 insertions, 37 deletions
diff --git a/Objects/unicodectype.c b/Objects/unicodectype.c index f6e3250824..a41ceb8240 100644 --- a/Objects/unicodectype.c +++ b/Objects/unicodectype.c @@ -163,8 +163,6 @@ int _PyUnicode_IsPrintable(Py_UCS4 ch) return (ctype->flags & PRINTABLE_MASK) != 0; } -#ifndef WANT_WCTYPE_FUNCTIONS - /* Returns 1 for Unicode characters having the category 'Ll', 0 otherwise. */ @@ -223,34 +221,3 @@ int _PyUnicode_IsAlpha(Py_UCS4 ch) return (ctype->flags & ALPHA_MASK) != 0; } -#else - -/* Export the interfaces using the wchar_t type for portability - reasons: */ - -int _PyUnicode_IsLowercase(Py_UCS4 ch) -{ - return iswlower(ch); -} - -int _PyUnicode_IsUppercase(Py_UCS4 ch) -{ - return iswupper(ch); -} - -Py_UCS4 _PyUnicode_ToLowercase(Py_UCS4 ch) -{ - return towlower(ch); -} - -Py_UCS4 _PyUnicode_ToUppercase(Py_UCS4 ch) -{ - return towupper(ch); -} - -int _PyUnicode_IsAlpha(Py_UCS4 ch) -{ - return iswalpha(ch); -} - -#endif diff --git a/Objects/unicodetype_db.h b/Objects/unicodetype_db.h index 637f6298cd..ef18b95cf3 100644 --- a/Objects/unicodetype_db.h +++ b/Objects/unicodetype_db.h @@ -3247,9 +3247,6 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) */ int _PyUnicode_IsWhitespace(register const Py_UCS4 ch) { -#ifdef WANT_WCTYPE_FUNCTIONS - return iswspace(ch); -#else switch (ch) { case 0x0009: case 0x000A: @@ -3284,7 +3281,6 @@ int _PyUnicode_IsWhitespace(register const Py_UCS4 ch) return 1; } return 0; -#endif } /* Returns 1 for Unicode characters having the line break |