From 1325cd5a7975fce33ac1b357dcaf23fa97b0c6a8 Mon Sep 17 00:00:00 2001 From: Anuvab Mohanty Date: Wed, 11 Oct 2017 14:54:44 +0530 Subject: [PATCH] Replaced basestring with six.string_types For tentative python 3 support. Also, reordered some imports. --- splitjson/widgets.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/splitjson/widgets.py b/splitjson/widgets.py index 4b842c6..3d1c705 100644 --- a/splitjson/widgets.py +++ b/splitjson/widgets.py @@ -1,13 +1,16 @@ # -*- coding: utf-8 -*- -from django import get_version, forms -from django.forms import Widget -from django import utils +import six import copy -from distutils.version import StrictVersion try: import simplejson as json except ImportError: import json + +from django import get_version, forms +from django.forms import Widget +from django import utils + +from distutils.version import StrictVersion if StrictVersion(get_version()) < StrictVersion('1.9.0'): from django.forms.util import flatatt else: @@ -47,7 +50,7 @@ def _to_build(self, name, json_obj): self.separator, key), value)) inputs.extend([_l]) - elif isinstance(json_obj, (basestring, int, float)): + elif isinstance(json_obj, (six.string_types[0], int, float)): name, _, key = name.rpartition(self.separator) inputs.append(self._as_text_field(name, key, json_obj)) elif json_obj is None: