[Python-checkins] cpython (merge 3.3 -> default): Merge with 3.3

[terry.reedy]

http://hg.python.org/cpython/rev/b8d95dfcafa3
changeset:   84373:b8d95dfcafa3
parent:      84370:f3f38c84aebc
parent:      84372:b3d19f0494e7
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Sat Jun 29 13:16:17 2013 -0400
summary:
  Merge with 3.3

files:
  Doc/library/unittest.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -950,7 +950,7 @@
       a regular expression object or a string containing a regular expression
       suitable for use by :func:`re.search`.  Examples::
 
-         self.assertRaisesRegex(ValueError, 'invalid literal for.*XYZ$',
+         self.assertRaisesRegex(ValueError, "invalid literal for.*XYZ'$",
                                 int, 'XYZ')
 
       or::

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