summaryrefslogtreecommitdiff
path: root/django/utils/archive.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/utils/archive.py
parentcacd845996d1245f6aed257bff5f748f46206d3f (diff)
[py3] Replaced basestring by six.string_types.
Diffstat (limited to 'django/utils/archive.py')
-rw-r--r--django/utils/archive.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/django/utils/archive.py b/django/utils/archive.py
index 70e1f9ba59..6b5d73290f 100644
--- a/django/utils/archive.py
+++ b/django/utils/archive.py
@@ -27,6 +27,8 @@ import sys
import tarfile
import zipfile
+from django.utils import six
+
class ArchiveException(Exception):
"""
@@ -58,7 +60,7 @@ class Archive(object):
@staticmethod
def _archive_cls(file):
cls = None
- if isinstance(file, basestring):
+ if isinstance(file, six.string_types):
filename = file
else:
try: