[Python-checkins] cpython (merge 3.3 -> default): merge 3.3

[benjamin.peterson]

http://hg.python.org/cpython/rev/50cee52219c5
changeset:   86206:50cee52219c5
parent:      86204:4204de1e673e
parent:      86205:fdc8da393675
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Oct 10 20:17:29 2013 -0400
summary:
  merge 3.3

files:
  Modules/unicodedata.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c
--- a/Modules/unicodedata.c
+++ b/Modules/unicodedata.c
@@ -1325,7 +1325,7 @@
 6.3.0 which is publically available from ftp://ftp.unicode.org/.\n\
 \n\
 The module uses the same names and symbols as defined by the\n\
-UnicodeData File Format 6.3.0");
+UnicodeData File Format " UNIDATA_VERSION ".");
 
 static struct PyModuleDef unicodedatamodule = {
         PyModuleDef_HEAD_INIT,

-- 
Repository URL: http://hg.python.org/cpython