summaryrefslogtreecommitdiff
path: root/django/utils/encoding.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-07-20 12:45:19 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-07-22 09:29:53 +0200
commit56dbe924a6e700cefbfd34f1a5aa6c1ee01478dc (patch)
treedb6519ad2cb48518c61d9b0c74bcc7b2a5b453fa /django/utils/encoding.py
parentf1d5dc81ac37fe9a7c7ca860900ee6a16150bb09 (diff)
[py3] Removed longs.
Diffstat (limited to 'django/utils/encoding.py')
-rw-r--r--django/utils/encoding.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index 80e456ba2a..30665480f6 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -7,6 +7,7 @@ import codecs
from decimal import Decimal
from django.utils.functional import Promise
+from django.utils import six
class DjangoUnicodeDecodeError(UnicodeDecodeError):
def __init__(self, obj, *args):
@@ -45,12 +46,8 @@ def is_protected_type(obj):
Objects of protected types are preserved as-is when passed to
force_unicode(strings_only=True).
"""
- return isinstance(obj, (
- type(None),
- int, long,
- datetime.datetime, datetime.date, datetime.time,
- float, Decimal)
- )
+ return isinstance(obj, six.integer_types + (type(None), float, Decimal,
+ datetime.datetime, datetime.date, datetime.time))
def force_unicode(s, encoding='utf-8', strings_only=False, errors='strict'):
"""