From cbfb7894b81c7d636af17b079e178b8b3fbe6dd9 Mon Sep 17 00:00:00 2001 From: Kelvin Jayanoris Date: Thu, 22 Mar 2018 15:39:01 +0300 Subject: [PATCH] Python3 fix for cStringIO --- onadata/libs/utils/common_tools.py | 4 ++-- onadata/libs/utils/csv_import.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/onadata/libs/utils/common_tools.py b/onadata/libs/utils/common_tools.py index 6a94a394a2..bdebc6721a 100644 --- a/onadata/libs/utils/common_tools.py +++ b/onadata/libs/utils/common_tools.py @@ -2,7 +2,7 @@ """ Common helper functions """ -import cStringIO +from io import StringIO import sys import traceback import uuid @@ -95,7 +95,7 @@ def get_response_content(response): """ contents = u'' if response.streaming: - actual_content = cStringIO.StringIO() + actual_content = StringIO() for content in response.streaming_content: actual_content.write(content) contents = actual_content.getvalue() diff --git a/onadata/libs/utils/csv_import.py b/onadata/libs/utils/csv_import.py index 4eeca39d9f..e8b72a2e06 100644 --- a/onadata/libs/utils/csv_import.py +++ b/onadata/libs/utils/csv_import.py @@ -1,4 +1,4 @@ -import cStringIO +from io import StringIO import json import sys import uuid @@ -136,7 +136,7 @@ def submit_csv(username, xform, csv_file): :rtype: Dict """ if isinstance(csv_file, unicode): - csv_file = cStringIO.StringIO(csv_file) + csv_file = StringIO(csv_file) elif csv_file is None or not hasattr(csv_file, 'read'): return async_status(FAILED, (u'Invalid param type for `csv_file`. ' 'Expected utf-8 encoded file or unicode' @@ -258,7 +258,7 @@ def submit_csv(username, xform, csv_file): row_uuid = row.get('meta').get('instanceID') rollback_uuids.append(row_uuid.replace('uuid:', '')) - xml_file = cStringIO.StringIO( + xml_file = StringIO( dict2xmlsubmission(row, xform, row_uuid, submission_date)) try: