diff --git a/common/djangoapps/entitlements/models.py b/common/djangoapps/entitlements/models.py index 08e936903822c14f3e84858f4b4bdcfacf094a97..348c87f92afa06b6f7cb46afc588b9f2a320c06f 100644 --- a/common/djangoapps/entitlements/models.py +++ b/common/djangoapps/entitlements/models.py @@ -444,7 +444,7 @@ class CourseEntitlement(TimeStampedModel): refund_successful = refund_entitlement(course_entitlement=self) if not refund_successful: # This state is achieved in most cases by a failure in the ecommerce service to process the refund. - log.warn( + log.warning( u'Entitlement Refund failed for Course Entitlement [%s], alert User', self.uuid ) diff --git a/common/lib/xmodule/xmodule/conditional_module.py b/common/lib/xmodule/xmodule/conditional_module.py index bb3f141caffc11c1cf0e5b3468766cf1eae69c90..cd45d7b83556b0e4d6a667fdf5879eba1afa8c12 100644 --- a/common/lib/xmodule/xmodule/conditional_module.py +++ b/common/lib/xmodule/xmodule/conditional_module.py @@ -166,7 +166,7 @@ class ConditionalModule(ConditionalFields, XModule, StudioEditableModule): if module is not None: # We do not want to log when module is None, and it is when requester # does not have access to the requested required module. - log.warn('Error in conditional module: \ + log.warning('Error in conditional module: \ required module {module} has no {module_attr}'.format(module=module, module_attr=attr_name)) return False diff --git a/common/lib/xmodule/xmodule/modulestore/split_migrator.py b/common/lib/xmodule/xmodule/modulestore/split_migrator.py index 1fcc9f86451a4d28a98e138b59170214230311dd..68af627acaf6fbc0dc59329fd7e0e95fa6dcf4b4 100644 --- a/common/lib/xmodule/xmodule/modulestore/split_migrator.py +++ b/common/lib/xmodule/xmodule/modulestore/split_migrator.py @@ -170,7 +170,7 @@ class SplitMigrator(object): draft_location, revision=ModuleStoreEnum.RevisionOption.draft_preferred, **kwargs ) if parent_loc is None: - log.warn(u'No parent found in source course for %s', draft_location) + log.warning(u'No parent found in source course for %s', draft_location) continue old_parent = self.source_modulestore.get_item(parent_loc, **kwargs) split_parent_loc = new_draft_course_loc.make_usage_key( diff --git a/common/lib/xmodule/xmodule/video_module/video_utils.py b/common/lib/xmodule/xmodule/video_module/video_utils.py index d05464ea689f11a0647340d62e3fe635c1a39892..8b6f0e3bee1576aad1b6c289f171bcd39b7af2ba 100644 --- a/common/lib/xmodule/xmodule/video_module/video_utils.py +++ b/common/lib/xmodule/xmodule/video_module/video_utils.py @@ -69,7 +69,7 @@ def rewrite_video_url(cdn_base_url, original_video_url): validator(rewritten_url) return rewritten_url except ValidationError: - log.warn("Invalid CDN rewrite URL encountered, %s", rewritten_url) + log.warning("Invalid CDN rewrite URL encountered, %s", rewritten_url) # Mimic the behavior of removed get_video_from_cdn in this regard and # return None causing the caller to use the original URL. diff --git a/lms/djangoapps/commerce/utils.py b/lms/djangoapps/commerce/utils.py index 1c6ea8be4a63404bd8bdff120a8113296ba7a733..e82f4696033fba601557c16f8b22ed9f6694e389 100644 --- a/lms/djangoapps/commerce/utils.py +++ b/lms/djangoapps/commerce/utils.py @@ -208,7 +208,7 @@ def refund_entitlement(course_entitlement): always_notify=True, ) else: - log.warn(u'No refund opened for user [%s], course entitlement [%s]', enrollee.id, entitlement_uuid) + log.warning(u'No refund opened for user [%s], course entitlement [%s]', enrollee.id, entitlement_uuid) return False diff --git a/openedx/core/djangoapps/django_comment_common/models.py b/openedx/core/djangoapps/django_comment_common/models.py index 6f11b1165eadf5dd8928d5c701f5020fed219e7f..efd2709ead5b32cc96e2b91a3fabe03e0c3de19e 100644 --- a/openedx/core/djangoapps/django_comment_common/models.py +++ b/openedx/core/djangoapps/django_comment_common/models.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring,unused-argument,model-missing-unicode +# pylint: disable=missing-docstring,unused-argument import json diff --git a/openedx/core/djangoapps/geoinfo/middleware.py b/openedx/core/djangoapps/geoinfo/middleware.py index 6f0399d9ed0dd4a1eea675df1066898af3a15990..dbc01ec95aa8feb94fc5a0f6aa7d1b9cea962bf8 100644 --- a/openedx/core/djangoapps/geoinfo/middleware.py +++ b/openedx/core/djangoapps/geoinfo/middleware.py @@ -41,7 +41,6 @@ class CountryMiddleware(MiddlewareMixin): reader = geoip2.database.Reader(settings.GEOIP_PATH) try: response = reader.country(new_ip_address) - # pylint: disable=no-member country_code = response.country.iso_code except geoip2.errors.AddressNotFoundError: country_code = "" diff --git a/openedx/core/djangoapps/site_configuration/tests/test_middleware.py b/openedx/core/djangoapps/site_configuration/tests/test_middleware.py index 890c6453c2df918e5e9fee381f569d80a4841283..1932b7e104caafc912e0c3df8a9c213ad4c86d07 100644 --- a/openedx/core/djangoapps/site_configuration/tests/test_middleware.py +++ b/openedx/core/djangoapps/site_configuration/tests/test_middleware.py @@ -4,9 +4,6 @@ Test site_configuration middleware. """ -from mock import patch - -from django.conf import settings from django.test import TestCase from django.test.client import Client from django.test.utils import override_settings