summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Reitz <me@kennethreitz.com>2011-03-23 02:07:39 -0400
committerKenneth Reitz <me@kennethreitz.com>2011-03-23 02:07:39 -0400
commitb8ed741a36f5205669f7380ccb129fe6714a4555 (patch)
tree4fad52ca4598ae484318ba237bb6c77760d5117c
parentcddbd78a61871a91d5ef8d3b883cb43cfd145f75 (diff)
downloadtablib-b8ed741a36f5205669f7380ccb129fe6714a4555.tar.gz
Same codebase for 2.x and 3.x!
-rw-r--r--tablib/formats/_csv.py10
-rw-r--r--tablib/formats/_html.py3
-rw-r--r--tablib/formats/_tsv.py9
3 files changed, 17 insertions, 5 deletions
diff --git a/tablib/formats/_csv.py b/tablib/formats/_csv.py
index 8174501..46a26d5 100644
--- a/tablib/formats/_csv.py
+++ b/tablib/formats/_csv.py
@@ -3,7 +3,13 @@
""" Tablib - CSV Support.
"""
-import io
+import sys
+if sys.version_info.major > 2:
+ from io import StringIO
+else:
+ from cStringIO import StringIO
+
+
import csv
import os
@@ -17,7 +23,7 @@ extentions = ('csv',)
def export_set(dataset):
"""Returns CSV representation of Dataset."""
- stream = io.StringIO()
+ stream = StringIO()
_csv = csv.writer(stream)
for row in dataset._package(dicts=False):
diff --git a/tablib/formats/_html.py b/tablib/formats/_html.py
index bfa3b5c..64be2af 100644
--- a/tablib/formats/_html.py
+++ b/tablib/formats/_html.py
@@ -4,12 +4,13 @@
"""
import sys
-from io import StringIO
if sys.version_info.major > 2:
+ from io import StringIO
from tablib.packages import markup3 as markup
else:
+ from cStringIO import StringIO
from tablib.packages import markup
import tablib
diff --git a/tablib/formats/_tsv.py b/tablib/formats/_tsv.py
index 708c4b9..ab10d32 100644
--- a/tablib/formats/_tsv.py
+++ b/tablib/formats/_tsv.py
@@ -3,7 +3,12 @@
""" Tablib - TSV (Tab Separated Values) Support.
"""
-import io
+import sys
+if sys.version_info.major > 2:
+ from io import StringIO
+else:
+ from cStringIO import StringIO
+
import csv
import os
@@ -17,7 +22,7 @@ extentions = ('tsv',)
def export_set(dataset):
"""Returns a TSV representation of Dataset."""
- stream = io.StringIO()
+ stream = StringIO()
_tsv = csv.writer(stream, delimiter='\t')
for row in dataset._package(dicts=False):