projects
/
htsworkflow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
django-nose didn't work with django 1.1, so I went back to the nose plugin NoseDjango
[htsworkflow.git]
/
htsworkflow
/
frontend
/
auth.py
diff --git
a/htsworkflow/frontend/auth.py
b/htsworkflow/frontend/auth.py
index 4df771b7025b4b73c2a04011f874c26de8a873ca..31650a6bb56d6189503a8e6a04d6240c8330459f 100644
(file)
--- a/
htsworkflow/frontend/auth.py
+++ b/
htsworkflow/frontend/auth.py
@@
-2,8
+2,7
@@
Define some alternate authentication methods
"""
from django.core.exceptions import PermissionDenied
-
-from htsworkflow.frontend import settings
+from django.conf import settings
apidata = {'apiid': u'0', 'apikey': settings.DEFAULT_API_KEY}