Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #22: Replaced basestring with six.string_types #24

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Issue #22: Replaced basestring with six.string_types #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions splitjson/widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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:
Expand Down