StringIO

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index 3d71a81..c0f1e41 100644 (file)
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -17,7 +17,6 @@ import pickle
 import json
 import shutil
 from lxml import etree
-from StringIO import StringIO
 from optparse import OptionParser
 from pprint import PrettyPrinter
 from tempfile import mkstemp
@@ -34,6 +33,7 @@ from sfa.util.config import Config
 from sfa.util.version import version_core
 from sfa.util.cache import Cache
 from sfa.util.printable import printable
+from sfa.util.py23 import StringIO
 
 from sfa.storage.record import Record
 

diff --git a/sfa/rspecs/pg_rspec_converter.py b/sfa/rspecs/pg_rspec_converter.py
index 234465f..ef021c0 100755 (executable)
--- a/sfa/rspecs/pg_rspec_converter.py
+++ b/sfa/rspecs/pg_rspec_converter.py
@@ -2,11 +2,12 @@
 from __future__ import print_function
 
 from lxml import etree
-from StringIO import StringIO
 from sfa.util.xrn import Xrn, urn_to_hrn
 from sfa.rspecs.rspec import RSpec
 from sfa.rspecs.version_manager import VersionManager
 
+from sfa.util.py23 import StringIO
+
 xslt='''<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:output method="xml" indent="no"/>
 

diff --git a/sfa/trust/abac_credential.py b/sfa/trust/abac_credential.py
index 69ab105..cb6e686 100644 (file)
--- a/sfa/trust/abac_credential.py
+++ b/sfa/trust/abac_credential.py
@@ -27,9 +27,10 @@ from sfa.trust.credential import Credential, append_sub, DEFAULT_CREDENTIAL_LIFE
 from sfa.util.sfalogging import logger
 from sfa.util.sfatime import SFATIME_FORMAT
 
-from StringIO import StringIO
 from xml.dom.minidom import Document, parseString
 
+from sfa.util.py23 import StringIO
+
 HAVELXML = False
 try:
     from lxml import etree

diff --git a/sfa/trust/credential.py b/sfa/trust/credential.py
index f03e135..c4795cc 100644 (file)
--- a/sfa/trust/credential.py
+++ b/sfa/trust/credential.py
@@ -31,11 +31,11 @@ from __future__ import print_function
 import os, os.path
 import subprocess
 import datetime
-from StringIO import StringIO
 from tempfile import mkstemp
 from xml.dom.minidom import Document, parseString
 
 from sfa.util.py23 import StringType
+from sfa.util.py23 import StringIO
 
 HAVELXML = False
 try:

diff --git a/sfa/trust/speaksfor_util.py b/sfa/trust/speaksfor_util.py
index 20819c9..8317822 100644 (file)
--- a/sfa/trust/speaksfor_util.py
+++ b/sfa/trust/speaksfor_util.py
@@ -31,7 +31,6 @@ import subprocess
 import sys
 import tempfile
 from xml.dom.minidom import *
-from StringIO import StringIO
 
 from sfa.util.sfatime import SFATIME_FORMAT
 
@@ -41,6 +40,7 @@ from sfa.trust.abac_credential import ABACCredential, ABACElement
 from sfa.trust.credential_factory import CredentialFactory
 from sfa.trust.gid import GID
 from sfa.util.sfalogging import logger
+from sfa.util.py23 import StringIO
 
 # Routine to validate that a speaks-for credential 
 # says what it claims to say:

diff --git a/sfa/util/config.py b/sfa/util/config.py
index 797bed7..48ccd2b 100644 (file)
--- a/sfa/util/config.py
+++ b/sfa/util/config.py
@@ -5,8 +5,8 @@ import time
 import ConfigParser
 import tempfile
 import codecs
-from StringIO import StringIO
 from sfa.util.xml import XML
+from sfa.util.py23 import StringIO
 
 default_config = \
 """

diff --git a/sfa/util/py23.py b/sfa/util/py23.py
index 6f46671..723a8e1 100644 (file)
--- a/sfa/util/py23.py
+++ b/sfa/util/py23.py
@@ -2,3 +2,8 @@ try:
     StringType = basestring
 except:
     StringType = str
+
+try:
+    from StringIO import StringIO
+except:
+    from io import StringIO

diff --git a/sfa/util/xml.py b/sfa/util/xml.py
index 9c4a80f..af151b7 100755 (executable)
--- a/sfa/util/xml.py
+++ b/sfa/util/xml.py
@@ -1,10 +1,10 @@
 #!/usr/bin/python 
 from lxml import etree
-from StringIO import StringIO
 from sfa.util.faults import InvalidXML
 from sfa.rspecs.elements.element import Element
 
 from sfa.util.py23 import StringType
+from sfa.util.py23 import StringIO
 
 # helper functions to help build xpaths
 class XpathFilter: