diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-01-01 17:56:35 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-01-01 17:56:35 (GMT) |
| commit | 3e47a1337c0faa31ee97830f17fa12b850632811 (patch) | |
| tree | 975635cf2cc12d6f02090604d928156c6456de10 | |
| parent | fa1ef1e5250d51918671e3e6f247c32bdd3dc4af (diff) | |
| parent | 4e3dd513966d7cc2e03d97832e2fe22108b31e39 (diff) | |
| download | cpython-3e47a1337c0faa31ee97830f17fa12b850632811.zip cpython-3e47a1337c0faa31ee97830f17fa12b850632811.tar.gz cpython-3e47a1337c0faa31ee97830f17fa12b850632811.tar.bz2 | |
merge 3.5
| -rw-r--r-- | Doc/README.txt | 24 | ||||
| -rw-r--r-- | Modules/_collectionsmodule.c | 2 | ||||
| -rw-r--r-- | Modules/itertoolsmodule.c | 2 | ||||
| -rw-r--r-- | Objects/setobject.c | 3 | ||||
| -rw-r--r-- | README | 2 |
5 files changed, 1 insertions, 32 deletions
diff --git a/Doc/README.txt b/Doc/README.txt index 580d102..4f8e9f8 100644 --- a/Doc/README.txt +++ b/Doc/README.txt @@ -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. ----------------------------------------------------------------------- diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c index 6a53584..fbf07a8 100644 --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -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 diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c index a4ffa06..57eb4ec 100644 --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -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. */ diff --git a/Objects/setobject.c b/Objects/setobject.c index 9468ee6..8cb3f36 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -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. @@ -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. |