import cleanup - cStringIO is not unicode safe

src/pyff/i18n.py

@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 
 import gettext
-
 import cherrypy
 import locale
 import os

src/pyff/logs.py

@@ -2,7 +2,6 @@
 
 import logging
 import syslog
-
 import cherrypy
 
 def printable(s):

src/pyff/md.py

@@ -12,7 +12,6 @@
 import logging
 import sys
 import traceback
-
 from . import __version__
 from .mdrepo import MDRepository
 from .pipes import plumbing

src/pyff/mdrepo.py

@@ -5,7 +5,6 @@
 """
 
 from __future__ import absolute_import, unicode_literals
-
 from .stats import get_metadata_info
 import operator
 from lxml import etree

src/pyff/mdx.py

@@ -49,12 +49,8 @@
 
 import pkg_resources
 
-try:
-    from cStringIO import StringIO
-except ImportError:  # pragma: no cover
-    print(" *** install cStringIO for better performance")
-    from StringIO import StringIO
 
+from StringIO import StringIO
 import getopt
 import urlparse
 from cherrypy.lib.cpstats import StatsPage

src/pyff/pipes.py

@@ -4,11 +4,7 @@
 """
 import traceback
 
-try:
-    from cStringIO import StringIO
-except ImportError:  # pragma: no cover
-    print(" *** install cStringIO for better performance")
-    from StringIO import StringIO
+from StringIO import StringIO
 import os
 import yaml
 from .utils import resource_string, PyffException

src/pyff/samlmd.py

@@ -13,7 +13,6 @@
 from copy import deepcopy
 from .exceptions import *
 from StringIO import StringIO
-from .utils import dumptree
 
 
 class EntitySet(object):
@@ -110,7 +109,6 @@ def parse_saml_metadata(source,
                                             .format(base_url, source, xml_error(ex.error_log, m=base_url)))
 
         if t is not None:
-            #log.debug(dumptree(t))
             if t.tag == "{%s}EntityDescriptor" % NS['md']:
                 t = entitiesdescriptor([t], base_url, copy=False, validate=True, nsmap=t.nsmap)
 

src/pyff/store.py

@@ -1,15 +1,9 @@
-try:
-    from cStringIO import StringIO
-except ImportError:  # pragma: no cover
-    print(" *** install cStringIO for better performance")
-    from StringIO import StringIO
 
+from StringIO import StringIO
 import time
 from copy import deepcopy
-
 import re
 from redis import Redis
-
 from .constants import NS, ATTRS
 from .decorators import cached
 from .logs import log