[Python-checkins] cpython (merge 3.5 -> default): Merge 'used with permission' additions

[brett.cannon]

https://hg.python.org/cpython/rev/92442e434f88
changeset:   99907:92442e434f88
parent:      99904:8ad701463cd7
parent:      99906:ca8419fdb3c2
user:        Brett Cannon <brett at python.org>
date:        Fri Jan 15 09:54:16 2016 -0800
summary:
  Merge 'used with permission' additions

files:
  Lib/datetime.py            |  1 +
  Lib/encodings/hp_roman8.py |  2 ++
  Lib/unittest/__init__.py   |  2 +-
  3 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Lib/datetime.py b/Lib/datetime.py
--- a/Lib/datetime.py
+++ b/Lib/datetime.py
@@ -897,6 +897,7 @@
 
         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
--- 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
--- 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

-- 
Repository URL: https://hg.python.org/cpython