Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prevent circular ImportError hiding for rest_framework sub-package #741

Merged
merged 2 commits into from
Aug 31, 2017
Merged

Prevent circular ImportError hiding for rest_framework sub-package #741

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86dc77e
Prevent ImportError hiding for rest_framework sub-package
Jun 21, 2017
e5c5f66
Prefer explicit boolean
Aug 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions django_filters/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
# flake8: noqa
from __future__ import absolute_import

import pkgutil

from .constants import STRICTNESS
from .filterset import FilterSet
from .filters import *

# We make the `rest_framework` module available without an additional import.
# If DRF is not installed we simply set None.
try:
# If DRF is not installed, no-op.
if pkgutil.find_loader('rest_framework') is not None:
from . import rest_framework
except ImportError:
rest_framework = None
del pkgutil

__version__ = '1.0.4'

Expand Down