]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Add another ignore_bytes_warning call to log_test.
authorBen Darnell <ben@bendarnell.com>
Sun, 12 Oct 2014 02:59:15 +0000 (22:59 -0400)
committerBen Darnell <ben@bendarnell.com>
Sun, 25 Jan 2015 16:16:34 +0000 (11:16 -0500)
This fixes a failure apparently introduced by changes to warning
logic in python 3.4.2.

Conflicts:
tornado/test/log_test.py

tornado/test/log_test.py

index ee832c54112332b72f845627c7d84fa6e4d75668..6c243f5f04c1287a7df69700a8508145b8f2d416 100644 (file)
@@ -95,7 +95,8 @@ class LogFormatterTest(unittest.TestCase):
             self.assertEqual(self.get_output(), utf8(repr(b"\xe9")))
 
     def test_utf8_logging(self):
-        self.logger.error(u("\u00e9").encode("utf8"))
+        with ignore_bytes_warning():
+            self.logger.error(u("\u00e9").encode("utf8"))
         if issubclass(bytes_type, basestring_type):
             # on python 2, utf8 byte strings (and by extension ascii byte
             # strings) are passed through as-is.