remove dead code

io.BytesIO is available since Python 2.6; Tornado doesn't support Python 2.5, so there won't be ImportError.

diff --git a/tornado/curl_httpclient.py b/tornado/curl_httpclient.py
index 3da59a4df94d031d5e0428ff649449bbb8b243eb..53181885141f05e72a5f367030be7b64c321efff 100644 (file)
--- a/tornado/curl_httpclient.py
+++ b/tornado/curl_httpclient.py
@@ -23,6 +23,7 @@ import logging
 import pycurl
 import threading
 import time
+from io import BytesIO
 
 from tornado import httputil
 from tornado import ioloop
@@ -33,11 +34,6 @@ from tornado.escape import utf8, native_str
 from tornado.httpclient import HTTPResponse, HTTPError, AsyncHTTPClient, main
 from tornado.util import bytes_type
 
-try:
-    from io import BytesIO  # py3
-except ImportError:
-    from cStringIO import StringIO as BytesIO  # py2
-
 
 class CurlAsyncHTTPClient(AsyncHTTPClient):
     def initialize(self, io_loop, max_clients=10, defaults=None):

diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py
index 99f1c1a782cc9e9c2685417e6d436f4d973e1684..b8a8c4439706446e704601ef11dd2526080c08d6 100644 (file)
--- a/tornado/simple_httpclient.py
+++ b/tornado/simple_httpclient.py
@@ -19,11 +19,8 @@ import functools
 import re
 import socket
 import sys
+from io import BytesIO
 
-try:
-    from io import BytesIO  # python 3
-except ImportError:
-    from cStringIO import StringIO as BytesIO  # python 2
 
 try:
     import urlparse  # py2

diff --git a/tornado/test/httpclient_test.py b/tornado/test/httpclient_test.py
index 78daa74dccbf413027c53aaa00a6cea1dfbaf9db..f2f231ac0559a6b99646afbc1772c726be595d59 100644 (file)
--- a/tornado/test/httpclient_test.py
+++ b/tornado/test/httpclient_test.py
@@ -8,6 +8,7 @@ from contextlib import closing
 import functools
 import sys
 import threading
+from io import BytesIO
 
 from tornado.escape import utf8
 from tornado.httpclient import HTTPRequest, HTTPResponse, _RequestProxy, HTTPError, HTTPClient
@@ -22,11 +23,6 @@ from tornado.test.util import unittest, skipOnTravis
 from tornado.util import u, bytes_type
 from tornado.web import Application, RequestHandler, url
 
-try:
-    from io import BytesIO  # python 3
-except ImportError:
-    from cStringIO import StringIO as BytesIO
-
 
 class HelloWorldHandler(RequestHandler):
     def get(self):

diff --git a/tornado/test/httpserver_test.py b/tornado/test/httpserver_test.py
index 63a55291b900f8cf410b36cf6b0f2b2dfb888a27..66d6d3620c77fdbd5c06b39a9a866c345e6804c6 100644 (file)
--- a/tornado/test/httpserver_test.py
+++ b/tornado/test/httpserver_test.py
@@ -25,11 +25,7 @@ import socket
 import ssl
 import sys
 import tempfile
-
-try:
-    from io import BytesIO  # python 3
-except ImportError:
-    from cStringIO import StringIO as BytesIO  # python 2
+from io import BytesIO
 
 
 def read_stream_body(stream, callback):

diff --git a/tornado/web.py b/tornado/web.py
index 25ac56ebe14aaa7beb1388876a6cc985b5aaf8a9..49e191f36a3eb2afdb3ca308b457dd44fd641cfb 100644 (file)
--- a/tornado/web.py
+++ b/tornado/web.py
@@ -72,6 +72,7 @@ import time
 import tornado
 import traceback
 import types
+from io import BytesIO
 
 from tornado.concurrent import Future, is_future
 from tornado import escape
@@ -85,10 +86,6 @@ from tornado import template
 from tornado.escape import utf8, _unicode
 from tornado.util import bytes_type, import_object, ObjectDict, raise_exc_info, unicode_type, _websocket_mask
 
-try:
-    from io import BytesIO  # python 3
-except ImportError:
-    from cStringIO import StringIO as BytesIO  # python 2
 
 try:
     import Cookie  # py2

diff --git a/tornado/wsgi.py b/tornado/wsgi.py
index 6e115e12555b0e339e16601a2a43a65ea4858274..05d1e7495c45dd4dd76356a13ea6b9d4ee4c376c 100644 (file)
--- a/tornado/wsgi.py
+++ b/tornado/wsgi.py
@@ -32,6 +32,7 @@ provides WSGI support in two ways:
 from __future__ import absolute_import, division, print_function, with_statement
 
 import sys
+from io import BytesIO
 import tornado
 
 from tornado.concurrent import Future
@@ -42,10 +43,6 @@ from tornado import web
 from tornado.escape import native_str
 from tornado.util import bytes_type, unicode_type
 
-try:
-    from io import BytesIO  # python 3
-except ImportError:
-    from cStringIO import StringIO as BytesIO  # python 2
 
 try:
     import urllib.parse as urllib_parse  # py3