From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 11 Oct 2013 00:17:29 +0000 (-0400)
Subject: merge 3.3
X-Git-Tag: v3.4.0a4~184
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0a1b87560ad214277f78d5a96fab78b61933a8b;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

f0a1b87560ad214277f78d5a96fab78b61933a8b
diff --cc Modules/unicodedata.c
index 59bfb343578a,901e337952e4..b96e96b50a1d
--- a/Modules/unicodedata.c
+++ b/Modules/unicodedata.c
@@@ -1322,11 -1322,12 +1322,11 @@@ PyDoc_STRVAR(unicodedata_docstring
  "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.0.0 which is publically available from ftp://ftp.unicode.org/.\n\
 +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,
          "unicodedata",