merge 3.3 (#19729)

diff --cc Lib/test/test_unicode.py
index 07f76a8ae0dbb23e56e666fa55bf1ad7282a501b,502d39368d622517bac227d657c24a899b1dce8d..575c4a58507b92756d5fad65ab3f587ed085f2b1
--- 1/Lib/test/test_unicode.py
--- 2/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@@ -964,15 -955,8 +964,17 @@@ class UnicodeTest(string_tests.CommonTe
                           '')
  
          self.assertEqual("{[{}]}".format({"{}": 5}), "5")
 +        self.assertEqual("{[{}]}".format({"{}" : "a"}), "a")
 +        self.assertEqual("{[{]}".format({"{" : "a"}), "a")
 +        self.assertEqual("{[}]}".format({"}" : "a"}), "a")
 +        self.assertEqual("{[[]}".format({"[" : "a"}), "a")
 +        self.assertEqual("{[!]}".format({"!" : "a"}), "a")
 +        self.assertRaises(ValueError, "{a{}b}".format, 42)
 +        self.assertRaises(ValueError, "{a{b}".format, 42)
 +        self.assertRaises(ValueError, "{[}".format, 42)
 +
+         self.assertEqual("0x{:0{:d}X}".format(0x0,16), "0x0000000000000000")
+ 
      def test_format_map(self):
          self.assertEqual(''.format_map({}), '')
          self.assertEqual('a'.format_map({}), 'a')

diff --cc Misc/NEWS
Simple merge