Add unidata_version. Bump generator version number.

diff --git a/Doc/lib/libunicodedata.tex b/Doc/lib/libunicodedata.tex
index add00c9e30f5d97582b2a00cb11bcab2e9309c7c..a6d9d4353c5281648be2b36e3be8fa3a92dd95f8 100644 (file)
--- 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 c5ba6fc4b4437f7a20f051815c203b39b45a5ed1..71fdcb05604ca81d99b8b369d262a399f0201e7b 100644 (file)
--- 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 94f3809e31fce65f1cf1d864c82922ee58b81cec..0007a2b1dacaa37f4987332720235b98454d0df4 100644 (file)
--- 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 55b4ef0a1da6f523b170030f276217174a64fb43..6ccf45fda7d6bbbc1820798fd725a3d66fe422de 100644 (file)
--- 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 338b6b402625c91ffd4e7823c0b935699f6d8c48..45ffa93125efe52f60b6822f988ee1f62a5f4f1e 100644 (file)
--- 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 f7dcad503353d214dd85654557b5f62712c51f32..c948312125b73b3d03e42a837554d742c8d5b3c4 100644 (file)
--- 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[] = {"