merge 3.5
This commit is contained in:
commit
3e47a1337c
|
@ -119,27 +119,3 @@ and we will process your request as soon as possible.
|
|||
|
||||
If you want to help the Documentation Team, you are always welcome. Just send
|
||||
a mail to docs@python.org.
|
||||
|
||||
|
||||
Copyright notice
|
||||
================
|
||||
|
||||
The Python source is copyrighted, but you can freely use and copy it
|
||||
as long as you don't change or remove the copyright notice:
|
||||
|
||||
----------------------------------------------------------------------
|
||||
Copyright (c) 2000-2015 Python Software Foundation.
|
||||
All rights reserved.
|
||||
|
||||
Copyright (c) 2000 BeOpen.com.
|
||||
All rights reserved.
|
||||
|
||||
Copyright (c) 1995-2000 Corporation for National Research Initiatives.
|
||||
All rights reserved.
|
||||
|
||||
Copyright (c) 1991-1995 Stichting Mathematisch Centrum.
|
||||
All rights reserved.
|
||||
|
||||
See the file "license.rst" for information on usage and redistribution
|
||||
of this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
----------------------------------------------------------------------
|
||||
|
|
|
@ -9,8 +9,6 @@
|
|||
|
||||
/* collections module implementation of a deque() datatype
|
||||
Written and maintained by Raymond D. Hettinger <python@rcn.com>
|
||||
Copyright (c) 2004-2015 Python Software Foundation.
|
||||
All rights reserved.
|
||||
*/
|
||||
|
||||
/* The block length may be set to any number over 1. Larger numbers
|
||||
|
|
|
@ -5,8 +5,6 @@
|
|||
|
||||
/* Itertools module written and maintained
|
||||
by Raymond D. Hettinger <python@rcn.com>
|
||||
Copyright (c) 2003-2015 Python Software Foundation.
|
||||
All rights reserved.
|
||||
*/
|
||||
|
||||
|
||||
|
|
|
@ -4,9 +4,6 @@
|
|||
Written and maintained by Raymond D. Hettinger <python@rcn.com>
|
||||
Derived from Lib/sets.py and Objects/dictobject.c.
|
||||
|
||||
Copyright (c) 2003-2015 Python Software Foundation.
|
||||
All rights reserved.
|
||||
|
||||
The basic lookup function used by all operations.
|
||||
This is based on Algorithm D from Knuth Vol. 3, Sec. 6.4.
|
||||
|
||||
|
|
2
README
2
README
|
@ -203,7 +203,7 @@ Copyright and License Information
|
|||
---------------------------------
|
||||
|
||||
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
|
||||
2012, 2013, 2014, 2015 Python Software Foundation. All rights reserved.
|
||||
2012, 2013, 2014, 2015, 2016 Python Software Foundation. All rights reserved.
|
||||
|
||||
Copyright (c) 2000 BeOpen.com. All rights reserved.
|
||||
|
||||
|
|
Loading…
Reference in New Issue