From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 12 Oct 2014 02:59:15 +0000 (-0400)
Subject: Add another ignore_bytes_warning call to log_test.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb8a07c36343a9238b4c76fa063913bf4fa40cba;p=thirdparty%2Ftornado.git

Add another ignore_bytes_warning call to log_test.

This fixes a failure apparently introduced by changes to warning
logic in python 3.4.2.

Conflicts:
	tornado/test/log_test.py
---

diff --git a/tornado/test/log_test.py b/tornado/test/log_test.py
index ee832c541..6c243f5f0 100644
--- a/tornado/test/log_test.py
+++ b/tornado/test/log_test.py
@@ -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.