Mirrors
/
cpython
mirror of https://github.com/python/cpython
3
0
Fork 0
Code Releases Activity
Browse Source

merge 3.4

pull/9921/head
Benjamin Peterson 10 years ago
parent
f2be8d75ac 630329e4ea
commit
4e3dd51396
5 changed files with 1 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      Doc/README.txt
  2. 2
      Modules/_collectionsmodule.c
  3. 2
      Modules/itertoolsmodule.c
  4. 3
      Objects/setobject.c
  5. 2
      README

24
Doc/README.txt
View File

@ -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 If you want to help the Documentation Team, you are always welcome. Just send
a mail to docs@python.org. 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.
----------------------------------------------------------------------

2
Modules/_collectionsmodule.c
View File

@ -9,8 +9,6 @@
/* collections module implementation of a deque() datatype /* collections module implementation of a deque() datatype
Written and maintained by Raymond D. Hettinger <python@rcn.com> 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 /* The block length may be set to any number over 1. Larger numbers

2
Modules/itertoolsmodule.c
View File

@ -4,8 +4,6 @@
/* Itertools module written and maintained /* Itertools module written and maintained
by Raymond D. Hettinger <python@rcn.com> by Raymond D. Hettinger <python@rcn.com>
Copyright (c) 2003-2013 Python Software Foundation.
All rights reserved.
*/ */

3
Objects/setobject.c
View File

@ -4,9 +4,6 @@
Written and maintained by Raymond D. Hettinger <python@rcn.com> Written and maintained by Raymond D. Hettinger <python@rcn.com>
Derived from Lib/sets.py and Objects/dictobject.c. 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. The basic lookup function used by all operations.
This is based on Algorithm D from Knuth Vol. 3, Sec. 6.4. This is based on Algorithm D from Knuth Vol. 3, Sec. 6.4.

2
README
View File

@ -203,7 +203,7 @@ Copyright and License Information
--------------------------------- ---------------------------------
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 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. Copyright (c) 2000 BeOpen.com. All rights reserved.

Write Preview
Loading…
Cancel
Save