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

[benjamin.peterson]

http://hg.python.org/cpython/rev/93f0e6e1be0b
changeset:   86208:93f0e6e1be0b
parent:      86206:50cee52219c5
parent:      86207:2d146914d446
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Oct 10 20:22:39 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
@@ -1322,7 +1322,7 @@
 "This module provides access to the Unicode Character Database which\n\
 defines character properties for all Unicode characters. The data in\n\
 this database is based on the UnicodeData.txt file version\n\
-6.3.0 which is publically available from ftp://ftp.unicode.org/.\n\
+" UNIDATA_VERSION " 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 " UNIDATA_VERSION ".");

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