summaryrefslogtreecommitdiff
path: root/django/forms/fields.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-07-20 14:22:00 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-07-22 09:29:54 +0200
commit3cb2457f46b3e40ff6b6acffcb3fd44cbea091e5 (patch)
tree68e43a061f1a7a122c02d5c5b39586b32959a9dc /django/forms/fields.py
parentcacd845996d1245f6aed257bff5f748f46206d3f (diff)
[py3] Replaced basestring by six.string_types.
Diffstat (limited to 'django/forms/fields.py')
-rw-r--r--django/forms/fields.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py
index 4668eade97..4c4209dddd 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -22,6 +22,7 @@ from django.forms.widgets import (TextInput, PasswordInput, HiddenInput,
from django.utils import formats
from django.utils.encoding import smart_unicode, force_unicode
from django.utils.ipv6 import clean_ipv6_address
+from django.utils import six
from django.utils.translation import ugettext_lazy as _
# Provide this import for backwards compatibility.
@@ -445,7 +446,7 @@ class RegexField(CharField):
return self._regex
def _set_regex(self, regex):
- if isinstance(regex, basestring):
+ if isinstance(regex, six.string_types):
regex = re.compile(regex, re.UNICODE)
self._regex = regex
if hasattr(self, '_regex_validator') and self._regex_validator in self.validators:
@@ -633,7 +634,7 @@ class BooleanField(Field):
# will submit for False. Also check for '0', since this is what
# RadioSelect will provide. Because bool("True") == bool('1') == True,
# we don't need to handle that explicitly.
- if isinstance(value, basestring) and value.lower() in ('false', '0'):
+ if isinstance(value, six.string_types) and value.lower() in ('false', '0'):
value = False
else:
value = bool(value)