From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 27 Nov 2013 01:24:01 +0000 (-0600)
Subject: merge 3.3 (#19729)
X-Git-Tag: v3.4.0b2~459
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d75803c1fcab18eca7859c212ca594137dd75e25;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#19729)
---

d75803c1fcab18eca7859c212ca594137dd75e25
diff --cc Lib/test/test_unicode.py
index 07f76a8ae0db,502d39368d62..575c4a58507b
--- a/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')