summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-04-10 16:35:31 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-04-10 16:35:31 (GMT)
commitfe2d27d068ac4ee1773e2b7d7f5719efc2210917 (patch)
tree3fab1e60dfd9c5b3a1a10de05034186cea9a231e /Misc
parent671cd3290bb046060c8173b5c8294e35fd02ca3d (diff)
parent161194a5d0b0785cefe9dde017707409a31ef712 (diff)
downloadcpython-fe2d27d068ac4ee1773e2b7d7f5719efc2210917.zip
cpython-fe2d27d068ac4ee1773e2b7d7f5719efc2210917.tar.gz
cpython-fe2d27d068ac4ee1773e2b7d7f5719efc2210917.tar.bz2
Merge heads.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS6
2 files changed, 7 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index a29747b..9a4cb52 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -240,6 +240,7 @@ Paul Colomiets
Christophe Combelles
Geremy Condra
Denver Coneybeare
+Phil Connell
Juan José Conti
Matt Conway
David M. Cooke
diff --git a/Misc/NEWS b/Misc/NEWS
index 6344e6c..0d13c70 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -70,6 +70,12 @@ Library
- Issue #17032: The "global" in the "NameError: global name 'x' is not defined"
error message has been removed. Patch by Ram Rachum.
+Tests
+-----
+
+- Issue #12820: add tests for the xml.dom.minicompat module.
+ Patch by John Chandler and Phil Connell.
+
What's New in Python 3.3.1 release candidate 1?
===============================================