From fc83133312ef976dd24905136967102351b814ea Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Fri, 17 Oct 2014 10:47:19 +0200 Subject: [PATCH] make tests succeed on Django-1.7 --- django_pyscss/utils.py | 3 ++- testproject/runtests.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/django_pyscss/utils.py b/django_pyscss/utils.py index 8ff5ad9..d668280 100644 --- a/django_pyscss/utils.py +++ b/django_pyscss/utils.py @@ -13,6 +13,7 @@ def find_all_files(glob): """ for finder in finders.get_finders(): for path, storage in finder.list([]): - if fnmatch.fnmatchcase(os.path.join(storage.prefix or '', path), + if fnmatch.fnmatchcase(os.path.join(getattr(storage, 'prefix', '') + or '', path), glob): yield path, storage diff --git a/testproject/runtests.py b/testproject/runtests.py index 394f24a..09930f0 100644 --- a/testproject/runtests.py +++ b/testproject/runtests.py @@ -3,6 +3,10 @@ import os import sys os.environ.setdefault("DJANGO_SETTINGS_MODULE", "testproject.testproject.settings") +import django +if hasattr(django, 'setup'): + django.setup() + from django.test.utils import get_runner from django.conf import settings -- 1.9.3