Commit 8433d02e authored by Tim Graham's avatar Tim Graham

Remove unittest2/importlib shims for Python 2.6

parent 0a9b7f3e
import importlib
import warnings import warnings
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
...@@ -7,11 +8,6 @@ from redis_cache.compat import ( ...@@ -7,11 +8,6 @@ from redis_cache.compat import (
smart_text, python_2_unicode_compatible, parse_qs, urlparse smart_text, python_2_unicode_compatible, parse_qs, urlparse
) )
try:
import importlib
except ImportError:
from django.utils import importlib
try: try:
basestring basestring
except NameError: except NameError:
......
hiredis==0.2.0 hiredis==0.2.0
django-nose==1.4 django-nose==1.4
nose==1.3.6 nose==1.3.6
unittest2==1.0.1
msgpack-python==0.4.6 msgpack-python==0.4.6
pyyaml==3.11 pyyaml==3.11
...@@ -4,13 +4,8 @@ from __future__ import unicode_literals ...@@ -4,13 +4,8 @@ from __future__ import unicode_literals
from hashlib import sha1 from hashlib import sha1
import os import os
import subprocess import subprocess
import sys
import time import time
import unittest
if sys.version_info < (2, 7):
import unittest2 as unittest
else:
import unittest
try: try:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment