From: Ben Darnell <ben@bendarnell.com>
Date: Wed, 3 Apr 2013 00:29:34 +0000 (-0400)
Subject: Fix precedence of StringIO imports for LogTrapTestCase.
X-Git-Tag: v3.0.1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=218ec03782bde8c50333f6999602dcd913eaee33;p=thirdparty%2Ftornado.git

Fix precedence of StringIO imports for LogTrapTestCase.

io.StringIO doesn't allow byte strings even on python 2, which causes
it to fail with the standard log formatter (but not tornado's "pretty
logging").

Closes #708.
---

diff --git a/tornado/testing.py b/tornado/testing.py
index b7d2881e9..61c843061 100644
--- a/tornado/testing.py
+++ b/tornado/testing.py
@@ -40,9 +40,9 @@ import socket
 import sys
 
 try:
-    from io import StringIO  # py3
-except ImportError:
     from cStringIO import StringIO  # py2
+except ImportError:
+    from io import StringIO  # py3
 
 # Tornado's own test suite requires the updated unittest module
 # (either py27+ or unittest2) so tornado.test.util enforces