diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2016-07-03 21:02:52 -0400 |
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2016-07-03 21:02:52 -0400 |
| commit | a5276b9056bedc1b78a6b809f68c9f77daf6ee3f (patch) | |
| tree | b94e1aeb5958c9269526ed0495340bcdb1847c9d | |
| parent | 75d3c99573e2459579afed8c540beadec8011de7 (diff) | |
| download | steuermann-a5276b9056bedc1b78a6b809f68c9f77daf6ee3f.tar.gz | |
Fix StringIO python 3k compat
| -rw-r--r-- | steuermann/nodes.py | 6 | ||||
| -rw-r--r-- | steuermann/report.py | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/steuermann/nodes.py b/steuermann/nodes.py index aaf42d6..521db2d 100644 --- a/steuermann/nodes.py +++ b/steuermann/nodes.py @@ -237,7 +237,11 @@ class node(object) : # debug - make a string representation of all the nodes def show_nodes( node_index ) : - import cStringIO as StringIO + try: + from io import StringIO + except ImportError: + from cStringIO import StringIO + s = StringIO.StringIO() for x in sorted( [ x for x in node_index ] ) : x = node_index[x] diff --git a/steuermann/report.py b/steuermann/report.py index afdf650..f27d84d 100644 --- a/steuermann/report.py +++ b/steuermann/report.py @@ -11,7 +11,7 @@ import pandokia.common try: from io import StringIO except ImportError: - import StringIO + from StringIO import StringIO # maybe the output is html 3.2 - in any case, it is way simpler than # more recent standards. @@ -170,7 +170,7 @@ def report_text( db, run_name, info_callback = info_callback_status ) : raw = raw_report( db, run_name, info_callback ) - s = StringIO.StringIO() + s = StringIO() table_list = get_table_list(db, run_name) @@ -196,7 +196,7 @@ def report_text( db, run_name, info_callback = info_callback_status ) : def report_html( db, run_name, info_callback = info_callback_status, hlevel=1 ) : raw = raw_report( db, run_name, info_callback ) - s = StringIO.StringIO() + s = StringIO() s.write('<h%d>%s</h%d>\n'%(hlevel,run_name,hlevel)) hlevel = hlevel + 1 |