Skip to content

Commit 167c3bc

Browse files
doko42doko42
committed
Merged revisions 84743 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84743 | matthias.klose | 2010-09-12 18:31:58 +0200 (So, 12 Sep 2010) | 3 lines - Issue python#9817: Add expat COPYING file; add expat, libffi and expat licenses to Doc/license.rst. ........
1 parent ffa272d commit 167c3bc

3 files changed

Lines changed: 113 additions & 0 deletions

File tree

‎Doc/license.rst‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -701,3 +701,92 @@ notice::
701701
***************************************************************/
702702

703703

704+
expat
705+
-----
706+
707+
The :mod:`pyexpat` extension is built using an included copy of the expat
708+
sources unless the build is configured :option:`--with-system-expat`::
709+
710+
Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
711+
and Clark Cooper
712+
713+
Permission is hereby granted, free of charge, to any person obtaining
714+
a copy of this software and associated documentation files (the
715+
"Software"), to deal in the Software without restriction, including
716+
without limitation the rights to use, copy, modify, merge, publish,
717+
distribute, sublicense, and/or sell copies of the Software, and to
718+
permit persons to whom the Software is furnished to do so, subject to
719+
the following conditions:
720+
721+
The above copyright notice and this permission notice shall be included
722+
in all copies or substantial portions of the Software.
723+
724+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
725+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
726+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
727+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
728+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
729+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
730+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
731+
732+
733+
libffi
734+
------
735+
736+
The :mod:`_ctypes` extension is built using an included copy of the libffi
737+
sources unless the build is configured :option:`--with-system-libffi`::
738+
739+
Copyright (c) 1996-2008 Red Hat, Inc and others.
740+
741+
Permission is hereby granted, free of charge, to any person obtaining
742+
a copy of this software and associated documentation files (the
743+
``Software''), to deal in the Software without restriction, including
744+
without limitation the rights to use, copy, modify, merge, publish,
745+
distribute, sublicense, and/or sell copies of the Software, and to
746+
permit persons to whom the Software is furnished to do so, subject to
747+
the following conditions:
748+
749+
The above copyright notice and this permission notice shall be included
750+
in all copies or substantial portions of the Software.
751+
752+
THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
753+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
754+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
755+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
756+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
757+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
758+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
759+
DEALINGS IN THE SOFTWARE.
760+
761+
762+
zlib
763+
----
764+
765+
The :mod:`zlib` extension is built using an included copy of the zlib
766+
sources unless the zlib version found on the system is too old to be
767+
used for the build::
768+
769+
Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
770+
771+
This software is provided 'as-is', without any express or implied
772+
warranty. In no event will the authors be held liable for any damages
773+
arising from the use of this software.
774+
775+
Permission is granted to anyone to use this software for any purpose,
776+
including commercial applications, and to alter it and redistribute it
777+
freely, subject to the following restrictions:
778+
779+
1. The origin of this software must not be misrepresented; you must not
780+
claim that you wrote the original software. If you use this software
781+
in a product, an acknowledgment in the product documentation would be
782+
appreciated but is not required.
783+
784+
2. Altered source versions must be plainly marked as such, and must not be
785+
misrepresented as being the original software.
786+
787+
3. This notice may not be removed or altered from any source distribution.
788+
789+
Jean-loup Gailly Mark Adler
790+
jloup@gzip.org madler@alumni.caltech.edu
791+
792+

‎Misc/NEWS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -622,6 +622,9 @@ Tests
622622
Documentation
623623
-------------
624624

625+
- Issue #9817: Add expat COPYING file; add expat, libffi and expat licenses
626+
to Doc/license.rst.
627+
625628
- Issue #9255: Document that the 'test' package is meant for interal Python use
626629
only.
627630

‎Modules/expat/COPYING‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
2+
and Clark Cooper
3+
4+
Permission is hereby granted, free of charge, to any person obtaining
5+
a copy of this software and associated documentation files (the
6+
"Software"), to deal in the Software without restriction, including
7+
without limitation the rights to use, copy, modify, merge, publish,
8+
distribute, sublicense, and/or sell copies of the Software, and to
9+
permit persons to whom the Software is furnished to do so, subject to
10+
the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included
13+
in all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
18+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
19+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
20+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
21+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

0 commit comments

Comments
 (0)