From: Stefan Krah <skrah@bytereef.org>
Date: Mon, 9 Dec 2013 18:03:24 +0000 (+0100)
Subject: Merge 3.3.
X-Git-Tag: v3.4.0b2~279
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2d181de44c8f7e8b2f12b87cefc7e2daaedd6a4d;p=thirdparty%2FPython%2Fcpython.git

Merge 3.3.
---

2d181de44c8f7e8b2f12b87cefc7e2daaedd6a4d
diff --cc Doc/license.rst
index ddc69b839d71,0947349c3b4d..91c0d7bad90a
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@@ -894,43 -846,35 +894,76 @@@ used for the build:
    jloup@gzip.org          madler@alumni.caltech.edu
  
  
 +cfuhash
 +-------
 +
 +The implementtation of the hash table used by the :mod:`tracemalloc` is based
 +on the cfuhash project::
 +
 +   Copyright (c) 2005 Don Owens
 +   All rights reserved.
 +
 +   This code is released under the BSD license:
 +
 +   Redistribution and use in source and binary forms, with or without
 +   modification, are permitted provided that the following conditions
 +   are met:
 +
 +     * Redistributions of source code must retain the above copyright
 +       notice, this list of conditions and the following disclaimer.
 +
 +     * Redistributions in binary form must reproduce the above
 +       copyright notice, this list of conditions and the following
 +       disclaimer in the documentation and/or other materials provided
 +       with the distribution.
 +
 +     * Neither the name of the author nor the names of its
 +       contributors may be used to endorse or promote products derived
 +       from this software without specific prior written permission.
 +
 +   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 +   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 +   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
 +   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
 +   COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
 +   INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 +   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 +   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 +   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 +   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 +   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 +   OF THE POSSIBILITY OF SUCH DAMAGE.
 +
++ 
+ libmpdec
+ --------
+ 
+ The :mod:`_decimal` Module is built using an included copy of the libmpdec
+ library unless the build is configured ``--with-system-libmpdec``::
+ 
+    Copyright (c) 2008-2016 Stefan Krah. All rights reserved.
+ 
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+ 
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+ 
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+ 
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+ 
+