Reorder import try block for use Zero-cost improvement

Author: ehooo

password_policies/admin.py

@@ -1,9 +1,9 @@
 from django.contrib import admin
 try:
-    # Deprecated in Django 3.0
-    from django.utils.translation import ugettext_lazy as _
-except ImportError:
     from django.utils.translation import gettext_lazy as _
+except ImportError:
+    # Before Django 3.0
+    from django.utils.translation import ugettext_lazy as _
 
 from password_policies.conf import settings
 from password_policies.models import PasswordChangeRequired, PasswordHistory

password_policies/context_processors.py

@@ -24,12 +24,10 @@ def password_status(request):
     )
 """
     d = {}
-    try:
-        # Did this ever worked? It gives error on Django 2.0
-        # and I haven't ran the test suite before that...
-        auth = request.user.is_authenticated()
-    except TypeError:
-        auth = request.user.is_authenticated
+    auth = request.user.is_authenticated
+    if callable(auth):  # Before Django 1.10
+        auth = auth()
+
     if auth:
         if '_password_policies_change_required' not in request.session:
             r = PasswordHistory.objects.change_required(request.user)

password_policies/forms/__init__.py

@@ -16,17 +16,18 @@
 
 
 try:
-    from django.contrib.sites.models import get_current_site
-except ImportError:
     from django.contrib.sites.shortcuts import get_current_site
+except ImportError:
+    # Before Django 1.9
+    from django.contrib.sites.models import get_current_site
 
 from django.utils.encoding import force_bytes
 from django.utils.http import urlsafe_base64_encode
 try:
-    # Deprecated in Django 3.0
-    from django.utils.translation import ugettext_lazy as _
-except ImportError:
     from django.utils.translation import gettext_lazy as _
+except ImportError:
+    # Before in Django 3.0
+    from django.utils.translation import ugettext_lazy as _
 
 from password_policies.conf import settings
 from password_policies.forms.fields import PasswordPoliciesField

password_policies/forms/admin.py

@@ -1,10 +1,10 @@
 from django import forms
 from django.contrib.auth.forms import AdminPasswordChangeForm
 try:
-    # Deprecated in Django 3.0
-    from django.utils.translation import ugettext_lazy as _
-except ImportError:
     from django.utils.translation import gettext_lazy as _
+except ImportError:
+    # Before in Django 3.0
+    from django.utils.translation import ugettext_lazy as _
 
 from password_policies.conf import settings
 from password_policies.forms.fields import PasswordPoliciesField

password_policies/forms/validators.py

@@ -7,21 +7,23 @@
 from django.core.exceptions import ValidationError
 
 try:
-    from django.utils.encoding import smart_text
-except ImportError:
     from django.utils.encoding import smart_str as smart_text
+except ImportError:
+    # Before in Django 2.0
+    from django.utils.encoding import smart_text
 
 try:
-    from django.utils.encoding import force_text
-except ImportError:
     from django.utils.encoding import force_str as force_text
-try:
-    # Deprecated in Django 3.0
-    from django.utils.translation import ugettext_lazy as _
-    from django.utils.translation import ungettext
 except ImportError:
+    # Before in Django 2.0
+    from django.utils.encoding import force_text
+try:
     from django.utils.translation import gettext_lazy as _
     from django.utils.translation import ngettext as ungettext
+except ImportError:
+    # Before in Django 3.0
+    from django.utils.translation import ugettext_lazy as _
+    from django.utils.translation import ungettext
 
 from password_policies.conf import settings
 
@@ -329,9 +331,9 @@ def __call__(self, value):
                 return
         ent = self.entropy(value)
         idealent = self.entropy_ideal(pwlen)
-        try:
+        if idealent:
             ent_quotient = ent / idealent
-        except ZeroDivisionError:
+        else:
             ent_quotient = 0
         if (pwlen < 100 and ent_quotient < self.short_min_entropy) or (
             pwlen >= 100 and ent < self.long_min_entropy

password_policies/middleware.py

@@ -2,16 +2,18 @@
 from datetime import timedelta
 
 try:
-    from django.core.urlresolvers import NoReverseMatch, Resolver404, resolve, reverse
-except ImportError:
     from django.urls.base import reverse, resolve, NoReverseMatch, Resolver404
+except ImportError:
+    # Before Django 2.0
+    from django.core.urlresolvers import NoReverseMatch, Resolver404, resolve, reverse
 
 from django.http import HttpResponseRedirect
 from django.utils import timezone
 
-try:
+import django.utils.deprecation
+if hasattr(django.utils.deprecation, 'MiddlewareMixin'):
     from django.utils.deprecation import MiddlewareMixin
-except ImportError:
+else:
     MiddlewareMixin = object
 
 from django.conf import settings as django_setings

password_policies/models.py

@@ -4,10 +4,10 @@
 from django.db.models import signals
 from django.utils import timezone
 try:
-    # Deprecated in Django 3.0
-    from django.utils.translation import ugettext_lazy as _
-except ImportError:
     from django.utils.translation import gettext_lazy as _
+except ImportError:
+    # Before in Django 3.0
+    from django.utils.translation import ugettext_lazy as _
 
 from password_policies.conf import settings
 from password_policies.managers import PasswordHistoryManager

password_policies/urls.py

@@ -1,12 +1,14 @@
 try:
-    from django.conf.urls import url
-except ImportError:
     from django.urls import re_path as url
+except ImportError:
+    # Before Django 2.0
+    from django.conf.urls import url
 
-try:
+import django.conf.urls
+if hasattr(django.conf.urls, 'patterns'):
     # patterns was deprecated in Django 1.8
     from django.conf.urls import patterns
-except ImportError:
+else:
     # patterns is unavailable in Django 1.10+
     patterns = False
 

password_policies/views.py

@@ -6,17 +6,19 @@
 from password_policies.exceptions import MustBeLoggedOutException
 
 try:
-    from django.core.urlresolvers import reverse
-except ImportError:
     from django.urls.base import reverse
+except ImportError:
+    # Before Django 2.0
+    from django.core.urlresolvers import reverse
 
 from django.shortcuts import resolve_url
 from django.utils.decorators import method_decorator
 
 try:
-    from django.utils.encoding import force_text
-except ImportError:
     from django.utils.encoding import force_str as force_text
+except ImportError:
+    # Before in Django 2.0
+    from django.utils.encoding import force_text
 
 from django.utils.http import urlsafe_base64_decode
 from django.views.decorators.cache import never_cache