From 674ae7718bc06a8b8c8b658075bf82c8198fb632 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Tue, 18 Mar 2014 12:49:12 +0100 Subject: Python 3: use new names of standard library modules Use "try/except ImportError" to try Python 2 and Python 3 names. --- paste/exceptions/collector.py | 5 +---- paste/exceptions/errormiddleware.py | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'paste/exceptions') diff --git a/paste/exceptions/collector.py b/paste/exceptions/collector.py index 65f9ec0..4f6d4c6 100644 --- a/paste/exceptions/collector.py +++ b/paste/exceptions/collector.py @@ -23,10 +23,7 @@ supplements import sys import traceback import time -try: - from cStringIO import StringIO -except ImportError: - from StringIO import StringIO +from six.moves import cStringIO as StringIO import linecache from paste.exceptions import serial_number_generator import warnings diff --git a/paste/exceptions/errormiddleware.py b/paste/exceptions/errormiddleware.py index 784414f..5654598 100644 --- a/paste/exceptions/errormiddleware.py +++ b/paste/exceptions/errormiddleware.py @@ -7,10 +7,7 @@ Error handler middleware import sys import traceback import cgi -try: - from cStringIO import StringIO -except ImportError: - from StringIO import StringIO +from six.moves import cStringIO as StringIO from paste.exceptions import formatter, collector, reporter from paste import wsgilib from paste import request -- cgit v1.2.1