From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 10 Oct 2013 21:40:30 +0000 (-0400)
Subject: merge 3.3 (#19220)
X-Git-Tag: v3.4.0a4~186
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d3c43a993cf746b0ea6ac1901198b59baffb91eb;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#19220)
---

d3c43a993cf746b0ea6ac1901198b59baffb91eb
diff --cc Modules/unicodedata.c
index 5530c7aea9fa,10d60e3cb75c..59bfb343578a
--- a/Modules/unicodedata.c
+++ b/Modules/unicodedata.c
@@@ -1322,12 -1322,11 +1322,10 @@@ 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 (see\n\
- http://www.unicode.org/reports/tr44/tr44-6.html).");
 -UnicodeData File Format 6.0.0.");
--
++UnicodeData File Format 6.3.0");
  
  static struct PyModuleDef unicodedatamodule = {
          PyModuleDef_HEAD_INIT,