Commit 4e0a2bef2c23240f828f3228873a316653a17c60
1 parent
6574825c
Removed unneeded try/except blocks
Now that Django 1.6 has been dropped, those conditional imports can be dropped also.
Showing
8 changed files
with
11 additions
and
35 deletions
| 1 | +from importlib import import_module | ||
| 2 | + | ||
| 1 | from django.conf import settings | 3 | from django.conf import settings |
| 2 | from django.core import urlresolvers | 4 | from django.core import urlresolvers |
| 3 | from django.core.exceptions import ImproperlyConfigured | 5 | from django.core.exceptions import ImproperlyConfigured |
| 4 | 6 | ||
| 5 | -try: | ||
| 6 | - from importlib import import_module | ||
| 7 | -except ImportError: | ||
| 8 | - from django.utils.importlib import import_module | ||
| 9 | - | ||
| 10 | 7 | ||
| 11 | DEFAULT_COMMENTS_APP = 'django_comments' | 8 | DEFAULT_COMMENTS_APP = 'django_comments' |
| 12 | 9 |
| 1 | +from django.contrib.sites.shortcuts import get_current_site | ||
| 1 | from django.contrib.syndication.views import Feed | 2 | from django.contrib.syndication.views import Feed |
| 2 | from django.utils.translation import ugettext as _ | 3 | from django.utils.translation import ugettext as _ |
| 3 | 4 | ||
| 4 | import django_comments | 5 | import django_comments |
| 5 | 6 | ||
| 6 | -from .compat import get_current_site | ||
| 7 | - | ||
| 8 | 7 | ||
| 9 | class LatestCommentFeed(Feed): | 8 | class LatestCommentFeed(Feed): |
| 10 | """Feed of latest comments on the current site.""" | 9 | """Feed of latest comments on the current site.""" |
| 1 | import time | 1 | import time |
| 2 | 2 | ||
| 3 | from django import forms | 3 | from django import forms |
| 4 | - | ||
| 5 | -try: | ||
| 6 | - from django.forms.utils import ErrorDict | ||
| 7 | -except ImportError: | ||
| 8 | - from django.forms.util import ErrorDict | ||
| 9 | - | ||
| 10 | from django.conf import settings | 4 | from django.conf import settings |
| 11 | from django.contrib.contenttypes.models import ContentType | 5 | from django.contrib.contenttypes.models import ContentType |
| 6 | +from django.forms.utils import ErrorDict | ||
| 12 | from django.utils.crypto import salted_hmac, constant_time_compare | 7 | from django.utils.crypto import salted_hmac, constant_time_compare |
| 13 | from django.utils.encoding import force_text | 8 | from django.utils.encoding import force_text |
| 14 | from django.utils.text import get_text_list | 9 | from django.utils.text import get_text_list |
| 1 | from django.conf import settings | 1 | from django.conf import settings |
| 2 | - | ||
| 3 | -try: | ||
| 4 | - from django.contrib.contenttypes.fields import GenericForeignKey | ||
| 5 | -except ImportError: | ||
| 6 | - from django.contrib.contenttypes.generic import GenericForeignKey | ||
| 7 | - | 2 | +from django.contrib.contenttypes.fields import GenericForeignKey |
| 8 | from django.contrib.contenttypes.models import ContentType | 3 | from django.contrib.contenttypes.models import ContentType |
| 9 | from django.contrib.sites.models import Site | 4 | from django.contrib.sites.models import Site |
| 10 | from django.core import urlresolvers | 5 | from django.core import urlresolvers |
| @@ -58,6 +58,7 @@ import datetime | @@ -58,6 +58,7 @@ import datetime | ||
| 58 | 58 | ||
| 59 | from django import VERSION | 59 | from django import VERSION |
| 60 | from django.conf import settings | 60 | from django.conf import settings |
| 61 | +from django.contrib.sites.shortcuts import get_current_site | ||
| 61 | from django.core.mail import send_mail | 62 | from django.core.mail import send_mail |
| 62 | from django.db.models.base import ModelBase | 63 | from django.db.models.base import ModelBase |
| 63 | from django.template import Context, loader | 64 | from django.template import Context, loader |
| @@ -66,8 +67,6 @@ from django.utils import timezone | @@ -66,8 +67,6 @@ from django.utils import timezone | ||
| 66 | import django_comments | 67 | import django_comments |
| 67 | from django_comments import signals | 68 | from django_comments import signals |
| 68 | 69 | ||
| 69 | -from .compat import get_current_site | ||
| 70 | - | ||
| 71 | 70 | ||
| 72 | class AlreadyModerated(Exception): | 71 | class AlreadyModerated(Exception): |
| 73 | """ | 72 | """ |
| 1 | from __future__ import absolute_import | 1 | from __future__ import absolute_import |
| 2 | 2 | ||
| 3 | from django import http | 3 | from django import http |
| 4 | +from django.apps import apps | ||
| 4 | from django.conf import settings | 5 | from django.conf import settings |
| 5 | from django.core.exceptions import ObjectDoesNotExist, ValidationError | 6 | from django.core.exceptions import ObjectDoesNotExist, ValidationError |
| 6 | from django.db import models | 7 | from django.db import models |
| @@ -10,11 +11,6 @@ from django.utils.html import escape | @@ -10,11 +11,6 @@ from django.utils.html import escape | ||
| 10 | from django.views.decorators.csrf import csrf_protect | 11 | from django.views.decorators.csrf import csrf_protect |
| 11 | from django.views.decorators.http import require_POST | 12 | from django.views.decorators.http import require_POST |
| 12 | 13 | ||
| 13 | -try: | ||
| 14 | - from django.apps import apps | ||
| 15 | -except ImportError: | ||
| 16 | - from django.db import models as apps | ||
| 17 | - | ||
| 18 | import django_comments | 14 | import django_comments |
| 19 | from django_comments import signals | 15 | from django_comments import signals |
| 20 | from django_comments.views.utils import next_redirect, confirmation_view | 16 | from django_comments.views.utils import next_redirect, confirmation_view |
Please
register
or
login
to post a comment