summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2016-01-15 17:54:16 (GMT)
committerBrett Cannon <brett@python.org>2016-01-15 17:54:16 (GMT)
commit43dab4bfcfd44b517e2ef568deaed5213fc410d8 (patch)
tree8d756000e1503ca304dbadf0e184ad5ede78d0e0 /Lib
parent2f1a0b6ad5ea9e8d05782f7d0055c393d184d91f (diff)
parent07b954d1488c961cf8520f9bdb727925bd4b191e (diff)
downloadcpython-43dab4bfcfd44b517e2ef568deaed5213fc410d8.zip
cpython-43dab4bfcfd44b517e2ef568deaed5213fc410d8.tar.gz
cpython-43dab4bfcfd44b517e2ef568deaed5213fc410d8.tar.bz2
Merge 'used with permission' additions
Diffstat (limited to 'Lib')
-rw-r--r--Lib/datetime.py1
-rw-r--r--Lib/encodings/hp_roman8.py2
-rw-r--r--Lib/unittest/__init__.py2
3 files changed, 4 insertions, 1 deletions
diff --git a/Lib/datetime.py b/Lib/datetime.py
index b734a74..3206923 100644
--- a/Lib/datetime.py
+++ b/Lib/datetime.py
@@ -897,6 +897,7 @@ class date:
ISO calendar algorithm taken from
http://www.phys.uu.nl/~vgent/calendar/isocalendar.htm
+ (used with permission)
"""
year = self._year
week1monday = _isoweek1monday(year)
diff --git a/Lib/encodings/hp_roman8.py b/Lib/encodings/hp_roman8.py
index 2334208..58de103 100644
--- a/Lib/encodings/hp_roman8.py
+++ b/Lib/encodings/hp_roman8.py
@@ -5,6 +5,8 @@
Original source: LaserJet IIP Printer User's Manual HP part no
33471-90901, Hewlet-Packard, June 1989.
+ (Used with permission)
+
"""#"
import codecs
diff --git a/Lib/unittest/__init__.py b/Lib/unittest/__init__.py
index f6d7ae2..7f61a80 100644
--- a/Lib/unittest/__init__.py
+++ b/Lib/unittest/__init__.py
@@ -1,6 +1,6 @@
"""
Python unit testing framework, based on Erich Gamma's JUnit and Kent Beck's
-Smalltalk testing framework.
+Smalltalk testing framework (used with permission).
This module contains the core framework classes that form the basis of
specific test cases and suites (TestCase, TestSuite etc.), and also a