summaryrefslogtreecommitdiff
path: root/passlib/tests
diff options
context:
space:
mode:
authorEli Collins <elic@assurancetechnologies.com>2012-03-12 22:41:12 -0400
committerEli Collins <elic@assurancetechnologies.com>2012-03-12 22:41:12 -0400
commitca830cd76a655f20488aebd082aba1a320e230d0 (patch)
treee06a21086d82987bb33da82ec7c3038153e66610 /passlib/tests
parent4307162072d9b1c65f41990752b39ad4483c0a00 (diff)
downloadpasslib-ca830cd76a655f20488aebd082aba1a320e230d0.tar.gz
updated passlib.ext.django; made some notes about django 1.4
(may not support django 1.4 until passlib 1.7)
Diffstat (limited to 'passlib/tests')
-rw-r--r--passlib/tests/test_ext_django.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/passlib/tests/test_ext_django.py b/passlib/tests/test_ext_django.py
index 13085fc..96de69e 100644
--- a/passlib/tests/test_ext_django.py
+++ b/passlib/tests/test_ext_django.py
@@ -30,13 +30,16 @@ except ImportError:
settings = None
has_django = False
-has_django0 = False #are we using django 0.9 release?
-has_django1 = False #inverse - are we using django >= 1.0
+has_django0 = False # are we using django 0.9?
+has_django1 = False # are we using django >= 1.0?
+has_django14 = False # are we using django >= 1.4?
if has_django:
from django import VERSION
+ log.debug("found django %r installation", VERSION)
has_django0 = (VERSION < (1,0))
has_django1 = (VERSION >= (1,0))
+ has_django14 = (VERSION >= (1,4))
if not isinstance(settings, LazySettings):
#this could mean django has been configured somehow,
@@ -51,6 +54,8 @@ if has_django:
else:
if not settings.configured:
settings.configure()
+else:
+ log.debug("django installation not found")
_NOTSET = object()