Merge branch 'master' into flake8

This commit is contained in:
mjaworski 2015-04-28 10:04:42 +02:00
commit ece4c01ada
2 changed files with 6 additions and 2 deletions

View File

@ -1,5 +1,9 @@
from six import string_types
from django.utils.importlib import import_module
import sys
if sys.version_info < (2, 7):
from django.utils.importlib import import_module
else:
from importlib import import_module
def import_callable(path_or_callable):