External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-09 18:37:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix for imports in awx.main.utils.

Browse Source
This commit is contained in:
Chris Church
2013-07-26 22:00:44 -04:00
parent 5ad361a32b
commit 21fc169b29
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/utils.py
View File

@@ -3,10 +3,6 @@ import logging
import re import re
import sys import sys
# Django
from django.conf import settings
from django.shortcuts import _get_queryset
# Django REST Framework # Django REST Framework
from rest_framework.exceptions import ParseError, PermissionDenied from rest_framework.exceptions import ParseError, PermissionDenied
@@ -17,6 +13,7 @@ def get_object_or_400(klass, *args, **kwargs):
Return a single object from the given model or queryset based on the query Return a single object from the given model or queryset based on the query
params, otherwise raise an exception that will return in a 400 response. params, otherwise raise an exception that will return in a 400 response.
''' '''
from django.shortcuts import _get_queryset
queryset = _get_queryset(klass) queryset = _get_queryset(klass)
try: try:
return queryset.get(*args, **kwargs) return queryset.get(*args, **kwargs)
@@ -30,6 +27,7 @@ def get_object_or_403(klass, *args, **kwargs):
Return a single object from the given model or queryset based on the query Return a single object from the given model or queryset based on the query
params, otherwise raise an exception that will return in a 403 response. params, otherwise raise an exception that will return in a 403 response.
''' '''
from django.shortcuts import _get_queryset
queryset = _get_queryset(klass) queryset = _get_queryset(klass)
try: try:
return queryset.get(*args, **kwargs) return queryset.get(*args, **kwargs)
@@ -51,4 +49,5 @@ class RequireDebugTrueOrTest(logging.Filter):
''' '''
def filter(self, record): def filter(self, record):
from django.conf import settings
return settings.DEBUG or 'test' in sys.argv return settings.DEBUG or 'test' in sys.argv