From 75cae7ebd231b83d521941790a21db1ccb024875 Mon Sep 17 00:00:00 2001 From: Ana Maria Rodriguez Date: Wed, 24 Apr 2019 14:07:32 -0500 Subject: [PATCH] INCR-174 Run python-modernize on openedx/core/djangoapps/heartbeat and openedx/core/djangoapps/signals --- openedx/core/djangoapps/password_policy/apps.py | 1 + openedx/core/djangoapps/password_policy/compliance.py | 3 ++- openedx/core/djangoapps/password_policy/forms.py | 1 + openedx/core/djangoapps/password_policy/tests/test_apps.py | 1 + .../core/djangoapps/password_policy/tests/test_compliance.py | 1 + openedx/core/djangoapps/password_policy/tests/test_forms.py | 1 + openedx/core/djangoapps/signals/signals.py | 1 + 7 files changed, 8 insertions(+), 1 deletion(-) diff --git a/openedx/core/djangoapps/password_policy/apps.py b/openedx/core/djangoapps/password_policy/apps.py index 8bf29da123..2ef04c6136 100644 --- a/openedx/core/djangoapps/password_policy/apps.py +++ b/openedx/core/djangoapps/password_policy/apps.py @@ -1,6 +1,7 @@ """ Configuration for password_policy Django app """ +from __future__ import absolute_import import logging import six from dateutil.parser import parse as parse_date diff --git a/openedx/core/djangoapps/password_policy/compliance.py b/openedx/core/djangoapps/password_policy/compliance.py index 742ba79ae8..c8888f6feb 100644 --- a/openedx/core/djangoapps/password_policy/compliance.py +++ b/openedx/core/djangoapps/password_policy/compliance.py @@ -1,6 +1,7 @@ """ Utilities for enforcing and tracking compliance with password policy rules. """ +from __future__ import absolute_import from datetime import datetime import pytz @@ -142,7 +143,7 @@ def _get_compliance_deadline_for_user(user): staff_deadline = staff_deadline if staff_deadline and user.is_staff else None # Take minimum remaining deadline - filtered_deadlines = filter(None, (staff_deadline, privilege_deadline, general_deadline,)) + filtered_deadlines = [_f for _f in (staff_deadline, privilege_deadline, general_deadline,) if _f] return min(filtered_deadlines) if filtered_deadlines else None diff --git a/openedx/core/djangoapps/password_policy/forms.py b/openedx/core/djangoapps/password_policy/forms.py index 379479dc05..2d3afc5d71 100644 --- a/openedx/core/djangoapps/password_policy/forms.py +++ b/openedx/core/djangoapps/password_policy/forms.py @@ -1,6 +1,7 @@ """ Forms for the password policy app. """ +from __future__ import absolute_import from django.contrib import messages from django.contrib.admin.forms import AdminAuthenticationForm from django.forms import ValidationError diff --git a/openedx/core/djangoapps/password_policy/tests/test_apps.py b/openedx/core/djangoapps/password_policy/tests/test_apps.py index 4fdf8252b0..5d2de31f6c 100644 --- a/openedx/core/djangoapps/password_policy/tests/test_apps.py +++ b/openedx/core/djangoapps/password_policy/tests/test_apps.py @@ -2,6 +2,7 @@ Test password policy settings """ +from __future__ import absolute_import import datetime from dateutil.parser import parse as parse_date from django.conf import settings diff --git a/openedx/core/djangoapps/password_policy/tests/test_compliance.py b/openedx/core/djangoapps/password_policy/tests/test_compliance.py index e05b371290..9a41aca4d7 100644 --- a/openedx/core/djangoapps/password_policy/tests/test_compliance.py +++ b/openedx/core/djangoapps/password_policy/tests/test_compliance.py @@ -1,6 +1,7 @@ """ Test password policy utilities """ +from __future__ import absolute_import from datetime import datetime, timedelta import pytz diff --git a/openedx/core/djangoapps/password_policy/tests/test_forms.py b/openedx/core/djangoapps/password_policy/tests/test_forms.py index be9c3fd98e..9a5cb7e2fc 100644 --- a/openedx/core/djangoapps/password_policy/tests/test_forms.py +++ b/openedx/core/djangoapps/password_policy/tests/test_forms.py @@ -1,6 +1,7 @@ """ Test password policy forms """ +from __future__ import absolute_import import mock from django.forms import ValidationError diff --git a/openedx/core/djangoapps/signals/signals.py b/openedx/core/djangoapps/signals/signals.py index d76aa1ea3a..796635c369 100644 --- a/openedx/core/djangoapps/signals/signals.py +++ b/openedx/core/djangoapps/signals/signals.py @@ -2,6 +2,7 @@ This module contains all general use signals. """ +from __future__ import absolute_import from django.dispatch import Signal # Signal that fires when a user is graded