summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2002-11-25 09:13:37 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2002-11-25 09:13:37 (GMT)
commitb5c980b8028af0876e40f71c94b82cd02e327bf0 (patch)
treea72f03661f7aab2ef706447951cec27da4fd0f49
parent05ced6aa761bab7348e95a479b6f791e636ceae7 (diff)
downloadcpython-b5c980b8028af0876e40f71c94b82cd02e327bf0.zip
cpython-b5c980b8028af0876e40f71c94b82cd02e327bf0.tar.gz
cpython-b5c980b8028af0876e40f71c94b82cd02e327bf0.tar.bz2
Add unidata_version. Bump generator version number.
-rw-r--r--Doc/lib/libunicodedata.tex7
-rw-r--r--Modules/unicodedata.c2
-rw-r--r--Modules/unicodedata_db.h3
-rw-r--r--Modules/unicodename_db.h2
-rw-r--r--Objects/unicodetype_db.h2
-rw-r--r--Tools/unicode/makeunicodedata.py8
6 files changed, 19 insertions, 5 deletions
diff --git a/Doc/lib/libunicodedata.tex b/Doc/lib/libunicodedata.tex
index add00c9..a6d9d43 100644
--- a/Doc/lib/libunicodedata.tex
+++ b/Doc/lib/libunicodedata.tex
@@ -117,3 +117,10 @@ followed by the canonical composition.
\versionadded{2.3}
\end{funcdesc}
+In addition, the module exposes the following constant:
+
+\begin{datadesc}{unidata_version}
+The version of the Unicode database used in this module.
+
+\versionadded{2.3}
+\end{datadesc} \ No newline at end of file
diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c
index c5ba6fc..71fdcb0 100644
--- a/Modules/unicodedata.c
+++ b/Modules/unicodedata.c
@@ -881,6 +881,8 @@ initunicodedata(void)
if (!m)
return;
+ PyModule_AddStringConstant(m, "unidata_version", UNIDATA_VERSION);
+
/* Export C API */
v = PyCObject_FromVoidPtr((void *) &hashAPI, NULL);
if (v != NULL)
diff --git a/Modules/unicodedata_db.h b/Modules/unicodedata_db.h
index 94f3809..0007a2b 100644
--- a/Modules/unicodedata_db.h
+++ b/Modules/unicodedata_db.h
@@ -1,5 +1,6 @@
-/* this file was generated by Tools/unicode/makeunicodedata.py 2.1 */
+/* this file was generated by Tools/unicode/makeunicodedata.py 2.2 */
+#define UNIDATA_VERSION "3.2.0"
/* a list of unique database records */
const _PyUnicode_DatabaseRecord _PyUnicode_Database_Records[] = {
{0, 0, 0, 0},
diff --git a/Modules/unicodename_db.h b/Modules/unicodename_db.h
index 55b4ef0..6ccf45f 100644
--- a/Modules/unicodename_db.h
+++ b/Modules/unicodename_db.h
@@ -1,4 +1,4 @@
-/* this file was generated by Tools/unicode/makeunicodedata.py 2.1 */
+/* this file was generated by Tools/unicode/makeunicodedata.py 2.2 */
#define NAME_MAXLEN 256
diff --git a/Objects/unicodetype_db.h b/Objects/unicodetype_db.h
index 338b6b4..45ffa93 100644
--- a/Objects/unicodetype_db.h
+++ b/Objects/unicodetype_db.h
@@ -1,4 +1,4 @@
-/* this file was generated by Tools/unicode/makeunicodedata.py 2.1 */
+/* this file was generated by Tools/unicode/makeunicodedata.py 2.2 */
/* a list of unique character type descriptors */
const _PyUnicode_TypeRecord _PyUnicode_TypeRecords[] = {
diff --git a/Tools/unicode/makeunicodedata.py b/Tools/unicode/makeunicodedata.py
index f7dcad5..c948312 100644
--- a/Tools/unicode/makeunicodedata.py
+++ b/Tools/unicode/makeunicodedata.py
@@ -1,7 +1,7 @@
#
# (re)generate unicode property and type databases
#
-# this script converts a unicode 3.0 database file to
+# this script converts a unicode 3.2 database file to
# Modules/unicodedata_db.h, Modules/unicodename_db.h,
# and Objects/unicodetype_db.h
#
@@ -17,6 +17,7 @@
# 2002-10-18 mvl update to Unicode 3.2
# 2002-10-22 mvl generate NFC tables
# 2002-11-24 mvl expand all ranges, sort names version-independently
+# 2002-11-25 mvl add UNIDATA_VERSION
#
# written by Fredrik Lundh (fredrik@pythonware.com)
#
@@ -24,8 +25,10 @@
import sys
SCRIPT = sys.argv[0]
-VERSION = "2.1"
+VERSION = "2.2"
+# The Unicode Database
+UNIDATA_VERSION = "3.2.0"
UNICODE_DATA = "UnicodeData.txt"
COMPOSITION_EXCLUSIONS = "CompositionExclusions.txt"
@@ -192,6 +195,7 @@ def makeunicodedata(unicode, trace):
fp = open(FILE, "w")
print >>fp, "/* this file was generated by %s %s */" % (SCRIPT, VERSION)
print >>fp
+ print >>fp, '#define UNIDATA_VERSION "%s"' % UNIDATA_VERSION
print >>fp, "/* a list of unique database records */"
print >>fp, \
"const _PyUnicode_DatabaseRecord _PyUnicode_Database_Records[] = {"