Python3 basestring fix

onadata/apps/api/tasks.py

@@ -8,6 +8,7 @@
 from io import BytesIO
 from onadata.apps.api import tools
 from onadata.apps.logger.models.xform import XForm
+from past.builtins import basestring
 
 
 def recreate_tmp_file(name, path, mime_type):

onadata/apps/api/tests/viewsets/test_attachment_viewset.py

@@ -1,4 +1,5 @@
 import os
+from past.builtins import basestring
 from django.utils import timezone
 
 from onadata.apps.api.tests.viewsets.test_abstract_viewset import \

onadata/apps/api/viewsets/dataview_viewset.py

@@ -1,6 +1,6 @@
 from django.http import HttpResponseBadRequest, Http404
 from django.db.models.signals import post_save, post_delete
-
+from past.builtins import basestring
 from celery.result import AsyncResult
 
 from rest_framework import status

onadata/apps/api/viewsets/user_profile_viewset.py

@@ -1,5 +1,5 @@
 import json
-
+from past.builtins import basestring
 from django.conf import settings
 
 from rest_framework import serializers

onadata/apps/logger/management/commands/import_instances.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: ai ts=4 sts=4 et sw=5 coding=utf-8
 import os
-
+from past.builtins import basestring
 from django.contrib.auth.models import User
 from django.core.management.base import BaseCommand, CommandError
 from django.utils.translation import ugettext as _, ugettext_lazy

onadata/apps/logger/models/instance.py

@@ -1,5 +1,5 @@
 import math
-
+from past.builtins import basestring
 from celery import task
 from datetime import datetime
 

onadata/apps/logger/models/widget.py

@@ -5,7 +5,7 @@
 from ordered_model.models import OrderedModel
 from querybuilder.fields import AvgField, CountField, SimpleField, SumField
 from querybuilder.query import Query
-
+from past.builtins import basestring
 from onadata.apps.logger.models.data_view import DataView
 from onadata.apps.logger.models.instance import Instance
 from onadata.apps.logger.models.xform import XForm

onadata/apps/main/models/meta_data.py

@@ -2,7 +2,7 @@
 import os
 import requests
 import logging
-
+from past.builtins import basestring
 from contextlib import closing
 from django.db.models.signals import post_save, post_delete
 from django.contrib.contenttypes.fields import GenericForeignKey

onadata/apps/main/tests/test_form_enter_data.py

@@ -1,7 +1,7 @@
 import os
 import re
 import requests
-
+from past.builtins import basestring
 from urlparse import urlparse
 from time import time
 from httmock import urlmatch, HTTMock

onadata/apps/sms_support/tools.py

@@ -6,7 +6,7 @@
 import io
 import copy
 from xml.parsers.expat import ExpatError
-
+from past.builtins import basestring
 from django.core.files.uploadedfile import InMemoryUploadedFile
 from django.utils.translation import ugettext as _
 from django.contrib.auth.models import User

onadata/apps/viewer/tests/test_export_builder.py

@@ -13,6 +13,7 @@
 from collections import OrderedDict
 from ctypes import ArgumentError
 from io import StringIO
+from past.builtins import basestring
 
 from django.conf import settings
 from django.core.files.temp import NamedTemporaryFile

onadata/libs/models/signals.py

@@ -1,5 +1,5 @@
 import django.dispatch
-
+from past.builtins import basestring
 from onadata.apps.logger.models import XForm
 
 xform_tags_add = django.dispatch.Signal(providing_args=['xform', 'tags'])

onadata/libs/serializers/chart_serializer.py

@@ -1,3 +1,4 @@
+from past.builtins import basestring
 from django.http import Http404
 from rest_framework import serializers
 

onadata/libs/serializers/fields/json_field.py

@@ -1,5 +1,5 @@
 import json
-
+from past.builtins import basestring
 from rest_framework import serializers
 
 

onadata/libs/serializers/organization_serializer.py

@@ -1,7 +1,7 @@
 from django.contrib.auth.models import User
 from django.utils.translation import ugettext as _
 from rest_framework import serializers
-
+from past.builtins import basestring
 from onadata.apps.api import tools
 from onadata.apps.api.models import OrganizationProfile
 from onadata.apps.api.tools import get_organization_members

onadata/libs/serializers/user_profile_serializer.py

@@ -4,7 +4,7 @@
 """
 import copy
 import re
-
+from past.builtins import basestring
 import six
 from django.conf import settings
 from django.contrib.auth.models import User

onadata/libs/utils/chart_tools.py

@@ -4,7 +4,7 @@
 from django.db.utils import DataError
 from django.http import Http404
 from rest_framework.exceptions import ParseError
-
+from past.builtins import basestring
 from onadata.apps.logger.models.data_view import DataView
 from onadata.apps.logger.models.xform import XForm
 from onadata.libs.data.query import (

onadata/libs/utils/common_tools.py

@@ -6,7 +6,7 @@
 import sys
 import traceback
 import uuid
-
+from past.builtins import basestring
 import six
 from django.conf import settings
 from django.core.mail import mail_admins

onadata/libs/utils/csv_builder.py

@@ -1,6 +1,6 @@
 from collections import OrderedDict
 from itertools import chain
-
+from past.builtins import basestring
 import unicodecsv as csv
 from django.conf import settings
 from django.db.models.query import QuerySet

onadata/libs/utils/dict_tools.py

@@ -3,6 +3,7 @@
 Dict utility functions module.
 """
 import json
+from past.builtins import basestring
 
 
 def get_values_matching_key(doc, key):

onadata/libs/utils/string.py

@@ -1,3 +1,6 @@
+from past.builtins import basestring
+
+
 def str2bool(v):
     return v.lower() in (
         'yes', 'true', 't', '1') if isinstance(v, basestring) else v

onadata/settings/common.py

@@ -15,6 +15,7 @@
 import sys
 import socket
 from future.moves.urllib.parse import urljoin
+from past.builtins import basestring
 from imp import reload
 
 from celery.signals import after_setup_logger