From b65601e023f973d0e5ddd3f102f232c4fa55637a Mon Sep 17 00:00:00 2001 From: adeelehsan Date: Fri, 12 Jul 2019 16:15:19 +0500 Subject: [PATCH] Executed python-modernize and isort on mentioned files in INCR-451 Please enter the commit message for your changes. Lines starting --- lms/djangoapps/badges/api/urls.py | 2 ++ lms/djangoapps/badges/migrations/0001_initial.py | 11 ++++++----- .../migrations/0002_data__migrate_assertions.py | 11 ++++++----- .../0003_schema__add_event_configuration.py | 4 ++-- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/lms/djangoapps/badges/api/urls.py b/lms/djangoapps/badges/api/urls.py index 5c6afd97b0..e53b6e2c3d 100644 --- a/lms/djangoapps/badges/api/urls.py +++ b/lms/djangoapps/badges/api/urls.py @@ -1,6 +1,8 @@ """ URLs for badges API """ +from __future__ import absolute_import + from django.conf import settings from django.conf.urls import url diff --git a/lms/djangoapps/badges/migrations/0001_initial.py b/lms/djangoapps/badges/migrations/0001_initial.py index d66191b57f..994488b796 100644 --- a/lms/djangoapps/badges/migrations/0001_initial.py +++ b/lms/djangoapps/badges/migrations/0001_initial.py @@ -1,14 +1,15 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals -from django.db import migrations, models -import jsonfield.fields -import badges.models -from django.conf import settings import django.utils.timezone +import jsonfield.fields +from django.conf import settings +from django.db import migrations, models from model_utils import fields from opaque_keys.edx.django.models import CourseKeyField +import badges.models + class Migration(migrations.Migration): diff --git a/lms/djangoapps/badges/migrations/0002_data__migrate_assertions.py b/lms/djangoapps/badges/migrations/0002_data__migrate_assertions.py index b47a446479..be38216bb9 100644 --- a/lms/djangoapps/badges/migrations/0002_data__migrate_assertions.py +++ b/lms/djangoapps/badges/migrations/0002_data__migrate_assertions.py @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals import json -from datetime import datetime - import os import time +from datetime import datetime + +import six from django.db import migrations, models @@ -44,7 +45,7 @@ def forwards(apps, schema_editor): badge_class.image.name = icon.name badge_class.save() classes[(badge.course_id, badge.mode)] = badge_class - if isinstance(badge.data, basestring): + if isinstance(badge.data, six.string_types): data = badge.data else: data = json.dumps(badge.data) @@ -82,7 +83,7 @@ def backwards(apps, schema_editor): if not badge.badge_class.mode: # Can't preserve old badges without modes. continue - if isinstance(badge.data, basestring): + if isinstance(badge.data, six.string_types): data = badge.data else: data = json.dumps(badge.data) diff --git a/lms/djangoapps/badges/migrations/0003_schema__add_event_configuration.py b/lms/djangoapps/badges/migrations/0003_schema__add_event_configuration.py index 51b221508f..b40a0aa40c 100644 --- a/lms/djangoapps/badges/migrations/0003_schema__add_event_configuration.py +++ b/lms/djangoapps/badges/migrations/0003_schema__add_event_configuration.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals -from django.db import migrations, models import django.db.models.deletion from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration):