Skip to content

Commit e2e9b86

Browse files
dastelsdastels
committed
Swap in PSF licensing
1 parent 2d237ed commit e2e9b86

File tree

3 files changed

+126
-64
lines changed

3 files changed

+126
-64
lines changed

‎LICENSE

Lines changed: 37 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,41 @@
1-
The MIT License (MIT)
1+
1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and
2+
the Individual or Organization ("Licensee") accessing and otherwise using Python
3+
3.7.3 software in source or binary form and its associated documentation.
24

3-
Copyright (c) 2019 Dave Astels for Adafruit Industries
5+
2. Subject to the terms and conditions of this License Agreement, PSF hereby
6+
grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
7+
analyze, test, perform and/or display publicly, prepare derivative works,
8+
distribute, and otherwise use Python 3.7.3 alone or in any derivative
9+
version, provided, however, that PSF's License Agreement and PSF's notice of
10+
copyright, i.e., "Copyright © 2001-2019 Python Software Foundation; All Rights
11+
Reserved" are retained in Python 3.7.3 alone or in any derivative version
12+
prepared by Licensee.
413

5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
14+
3. In the event Licensee prepares a derivative work that is based on or
15+
incorporates Python 3.7.3 or any part thereof, and wants to make the
16+
derivative work available to others as provided herein, then Licensee hereby
17+
agrees to include in any such work a brief summary of the changes made to Python
18+
3.7.3.
1119

12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
20+
4. PSF is making Python 3.7.3 available to Licensee on an "AS IS" basis.
21+
PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF
22+
EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR
23+
WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
24+
USE OF PYTHON 3.7.3 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
1425

15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
26+
5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 3.7.3
27+
FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
28+
MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 3.7.3, OR ANY DERIVATIVE
29+
THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
30+
31+
6. This License Agreement will automatically terminate upon a material breach of
32+
its terms and conditions.
33+
34+
7. Nothing in this License Agreement shall be deemed to create any relationship
35+
of agency, partnership, or joint venture between PSF and Licensee. This License
36+
Agreement does not grant permission to use PSF trademarks or trade name in a
37+
trademark sense to endorse or promote products or services of Licensee, or any
38+
third party.
39+
40+
8. By copying, installing or otherwise using Python 3.7.3, Licensee agrees
41+
to be bound by the terms and conditions of this License Agreement.

‎adafruit_itertools/adafruit_itertools.py

Lines changed: 44 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,53 @@
1-
# The MIT License (MIT)
2-
#
3-
# Copyright (c) 2019 Dave Astels for Adafruit Industries
4-
#
5-
# Permission is hereby granted, free of charge, to any person obtaining a copy
6-
# of this software and associated documentation files (the "Software"), to deal
7-
# in the Software without restriction, including without limitation the rights
8-
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
# copies of the Software, and to permit persons to whom the Software is
10-
# furnished to do so, subject to the following conditions:
11-
#
12-
# The above copyright notice and this permission notice shall be included in
13-
# all copies or substantial portions of the Software.
14-
#
15-
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21-
# THE SOFTWARE.
1+
# 1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and
2+
# the Individual or Organization ("Licensee") accessing and otherwise using Python
3+
# 3.7.3 software in source or binary form and its associated documentation.
4+
5+
# 2. Subject to the terms and conditions of this License Agreement, PSF hereby
6+
# grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
7+
# analyze, test, perform and/or display publicly, prepare derivative works,
8+
# distribute, and otherwise use Python 3.7.3 alone or in any derivative
9+
# version, provided, however, that PSF's License Agreement and PSF's notice of
10+
# copyright, i.e., "Copyright © 2001-2019 Python Software Foundation; All Rights
11+
# Reserved" are retained in Python 3.7.3 alone or in any derivative version
12+
# prepared by Licensee.
13+
14+
# 3. In the event Licensee prepares a derivative work that is based on or
15+
# incorporates Python 3.7.3 or any part thereof, and wants to make the
16+
# derivative work available to others as provided herein, then Licensee hereby
17+
# agrees to include in any such work a brief summary of the changes made to Python
18+
# 3.7.3.
19+
20+
# 4. PSF is making Python 3.7.3 available to Licensee on an "AS IS" basis.
21+
# PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF
22+
# EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR
23+
# WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
24+
# USE OF PYTHON 3.7.3 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
25+
26+
# 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 3.7.3
27+
# FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
28+
# MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 3.7.3, OR ANY DERIVATIVE
29+
# THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
30+
31+
# 6. This License Agreement will automatically terminate upon a material breach of
32+
# its terms and conditions.
33+
34+
# 7. Nothing in this License Agreement shall be deemed to create any relationship
35+
# of agency, partnership, or joint venture between PSF and Licensee. This License
36+
# Agreement does not grant permission to use PSF trademarks or trade name in a
37+
# trademark sense to endorse or promote products or services of Licensee, or any
38+
# third party.
39+
40+
# 8. By copying, installing or otherwise using Python 3.7.3, Licensee agrees
41+
# to be bound by the terms and conditions of this License Agreement.
2242
"""
2343
`adafruit_itertools`
2444
================================================================================
2545
26-
Python's itertools for CircuitPython
46+
Python's itertools adapted for CircuitPython by Dave Astels
2747
48+
Copyright 2001-2019 Python Software Foundation; All Rights Reserved
2849
29-
* Author(s): Dave Astels
50+
* Author(s): The PSF and Dave Astels
3051
3152
Implementation Notes
3253
--------------------

‎adafruit_itertools/adafruit_itertools_extras.py

Lines changed: 45 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,64 @@
1-
# The MIT License (MIT)
2-
#
3-
# Copyright (c) 2019 Dave Astels for Adafruit Industries
4-
#
5-
# Permission is hereby granted, free of charge, to any person obtaining a copy
6-
# of this software and associated documentation files (the "Software"), to deal
7-
# in the Software without restriction, including without limitation the rights
8-
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
# copies of the Software, and to permit persons to whom the Software is
10-
# furnished to do so, subject to the following conditions:
11-
#
12-
# The above copyright notice and this permission notice shall be included in
13-
# all copies or substantial portions of the Software.
14-
#
15-
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21-
# THE SOFTWARE.
1+
# 1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and
2+
# the Individual or Organization ("Licensee") accessing and otherwise using Python
3+
# 3.7.3 software in source or binary form and its associated documentation.
4+
5+
# 2. Subject to the terms and conditions of this License Agreement, PSF hereby
6+
# grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
7+
# analyze, test, perform and/or display publicly, prepare derivative works,
8+
# distribute, and otherwise use Python 3.7.3 alone or in any derivative
9+
# version, provided, however, that PSF's License Agreement and PSF's notice of
10+
# copyright, i.e., "Copyright © 2001-2019 Python Software Foundation; All Rights
11+
# Reserved" are retained in Python 3.7.3 alone or in any derivative version
12+
# prepared by Licensee.
13+
14+
# 3. In the event Licensee prepares a derivative work that is based on or
15+
# incorporates Python 3.7.3 or any part thereof, and wants to make the
16+
# derivative work available to others as provided herein, then Licensee hereby
17+
# agrees to include in any such work a brief summary of the changes made to Python
18+
# 3.7.3.
19+
20+
# 4. PSF is making Python 3.7.3 available to Licensee on an "AS IS" basis.
21+
# PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF
22+
# EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR
23+
# WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
24+
# USE OF PYTHON 3.7.3 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
25+
26+
# 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 3.7.3
27+
# FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
28+
# MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 3.7.3, OR ANY DERIVATIVE
29+
# THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
30+
31+
# 6. This License Agreement will automatically terminate upon a material breach of
32+
# its terms and conditions.
33+
34+
# 7. Nothing in this License Agreement shall be deemed to create any relationship
35+
# of agency, partnership, or joint venture between PSF and Licensee. This License
36+
# Agreement does not grant permission to use PSF trademarks or trade name in a
37+
# trademark sense to endorse or promote products or services of Licensee, or any
38+
# third party.
39+
40+
# 8. By copying, installing or otherwise using Python 3.7.3, Licensee agrees
41+
# to be bound by the terms and conditions of this License Agreement.
2242
"""
2343
`adafruit_itertools_extras`
2444
================================================================================
2545
26-
Extras for itertools for CircuitPython
46+
Extras for Python itertools adapted for CircuitPython by Dave Astels
2747
2848
This module contains an extended toolset using the existing itertools as
2949
building blocks.
3050
31-
The extended tools offer the same high performance as the underlying
51+
The extended tools offer the same performance as the underlying
3252
toolset. The superior memory performance is kept by processing elements one at
3353
a time rather than bringing the whole iterable into memory all at once. Code
3454
volume is kept small by linking the tools together in a functional style which
3555
helps eliminate temporary variables. High speed is retained by preferring
3656
"vectorized" building blocks over the use of for-loops and generators which
3757
incur interpreter overhead.
3858
59+
Copyright 2001-2019 Python Software Foundation; All Rights Reserved
3960
40-
* Author(s): Dave Astels
61+
* Author(s): The PSF and Dave Astels
4162
4263
Implementation Notes
4364
--------------------

0 commit comments

Comments
 (0)