Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: pyupgrade second iteration (#27453)

Browse Source
This commit is contained in:
Usama Sadiq
2021-05-10 13:48:34 +05:00
committed by GitHub
parent ea550c06a5
commit 2409ea22be
15 changed files with 76 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/djangoapps/third_party_auth/lti.py
View File

@@ -187,7 +187,7 @@ class LTIAuthBackend(BaseAuth):
if valid:
return data
except AttributeError as error:
log.error("'{}' not found.".format(str(error)))
log.error(f"'{str(error)}' not found.")
return None
@classmethod

8
common/djangoapps/third_party_auth/samlproviderconfig/tests/test_samlproviderconfig.py
View File

@@ -84,7 +84,7 @@ class SAMLProviderConfigTests(APITestCase):
)
urlbase = reverse('saml_provider_config-list')
query_kwargs = {'enterprise_customer_uuid': ENTERPRISE_ID}
url = '{}?{}'.format(urlbase, urlencode(query_kwargs))
url = f'{urlbase}?{urlencode(query_kwargs)}'
response = self.client.get(url, format='json')
@@ -102,7 +102,7 @@ class SAMLProviderConfigTests(APITestCase):
"""
urlbase = reverse('saml_provider_config-list')
query_kwargs = {'enterprise_customer_uuid': 'invalid_uuid'}
url = '{}?{}'.format(urlbase, urlencode(query_kwargs))
url = f'{urlbase}?{urlencode(query_kwargs)}'
response = self.client.get(url, format='json')
@@ -120,7 +120,7 @@ class SAMLProviderConfigTests(APITestCase):
urlbase = reverse('saml_provider_config-list')
query_kwargs = {'enterprise_customer_uuid': ENTERPRISE_ID_NON_EXISTENT}
url = '{}?{}'.format(urlbase, urlencode(query_kwargs))
url = f'{urlbase}?{urlencode(query_kwargs)}'
orig_count = SAMLProviderConfig.objects.count()
response = self.client.get(url, format='json')
@@ -221,7 +221,7 @@ class SAMLProviderConfigTests(APITestCase):
self.client.logout()
urlbase = reverse('saml_provider_config-list')
query_kwargs = {'enterprise_customer_uuid': ENTERPRISE_ID}
url = '{}?{}'.format(urlbase, urlencode(query_kwargs))
url = f'{urlbase}?{urlencode(query_kwargs)}'
set_jwt_cookie(self.client, self.user, [(ENTERPRISE_LEARNER_ROLE, ENTERPRISE_ID)])
response = self.client.get(url, format='json')
assert response.status_code == status.HTTP_403_FORBIDDEN

8
common/djangoapps/third_party_auth/samlproviderdata/tests/test_samlproviderdata.py
View File

@@ -81,7 +81,7 @@ class SAMLProviderDataTests(APITestCase):
# GET auth/saml/v0/providerdata/?enterprise_customer_uuid=id
url_base = reverse('saml_provider_data-list')
query_kwargs = {'enterprise_customer_uuid': ENTERPRISE_ID}
url = '{}?{}'.format(url_base, urlencode(query_kwargs))
url = f'{url_base}?{urlencode(query_kwargs)}'
response = self.client.get(url, format='json')
@@ -140,7 +140,7 @@ class SAMLProviderDataTests(APITestCase):
# DELETE auth/saml/v0/providerdata/ -d data
url_base = reverse('saml_provider_data-detail', kwargs={'pk': self.saml_provider_data.id})
query_kwargs = {'enterprise_customer_uuid': ENTERPRISE_ID}
url = '{}?{}'.format(url_base, urlencode(query_kwargs))
url = f'{url_base}?{urlencode(query_kwargs)}'
orig_count = SAMLProviderData.objects.count()
response = self.client.delete(url)
@@ -157,7 +157,7 @@ class SAMLProviderDataTests(APITestCase):
self.client.force_authenticate(user=self.user)
url_base = reverse('saml_provider_data-list')
query_kwargs = {'enterprise_customer_uuid': BAD_ENTERPRISE_ID}
url = '{}?{}'.format(url_base, urlencode(query_kwargs))
url = f'{url_base}?{urlencode(query_kwargs)}'
response = self.client.get(url, format='json')
@@ -167,7 +167,7 @@ class SAMLProviderDataTests(APITestCase):
self.client.logout()
urlbase = reverse('saml_provider_data-list')
query_kwargs = {'enterprise_customer_uuid': ENTERPRISE_ID}
url = '{}?{}'.format(urlbase, urlencode(query_kwargs))
url = f'{urlbase}?{urlencode(query_kwargs)}'
set_jwt_cookie(self.client, self.user, [(ENTERPRISE_LEARNER_ROLE, ENTERPRISE_ID)])
response = self.client.get(url, format='json')
assert response.status_code == status.HTTP_403_FORBIDDEN

2
common/djangoapps/track/backends/__init__.py
View File

@@ -12,7 +12,7 @@ import abc
import six
class BaseBackend(six.with_metaclass(abc.ABCMeta, object)):
class BaseBackend(metaclass=abc.ABCMeta):
"""
Abstract Base Class for event tracking backends.

2
common/djangoapps/track/backends/logger.py
View File

@@ -28,7 +28,7 @@ class LoggerBackend(BaseBackend):
been configured using the default python mechanisms.
"""
super(LoggerBackend, self).__init__(**kwargs) # lint-amnesty, pylint: disable=super-with-arguments
super().__init__(**kwargs) # lint-amnesty, pylint: disable=super-with-arguments
self.event_logger = logging.getLogger(name)

2
common/djangoapps/track/backends/mongodb.py
View File

@@ -33,7 +33,7 @@ class MongoBackend(BaseBackend):
"""
super(MongoBackend, self).__init__(**kwargs) # lint-amnesty, pylint: disable=super-with-arguments
super().__init__(**kwargs) # lint-amnesty, pylint: disable=super-with-arguments
# Extract connection parameters from kwargs

1
common/djangoapps/track/backends/tests/test_logger.py
View File

@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
"""Tests for Event tracker backend."""

4
common/djangoapps/track/backends/tests/test_mongodb.py
View File

@@ -1,14 +1,14 @@
# lint-amnesty, pylint: disable=missing-module-docstring
from unittest.mock import patch
from django.test import TestCase
from mock import patch
from common.djangoapps.track.backends.mongodb import MongoBackend
class TestMongoBackend(TestCase): # lint-amnesty, pylint: disable=missing-class-docstring
def setUp(self):
super(TestMongoBackend, self).setUp() # lint-amnesty, pylint: disable=super-with-arguments
super().setUp()
self.mongo_patcher = patch('common.djangoapps.track.backends.mongodb.MongoClient')
self.mongo_patcher.start()
self.addCleanup(self.mongo_patcher.stop)

4
common/djangoapps/track/contexts.py
View File

@@ -81,14 +81,14 @@ def context_dict_for_learning_context(context_key):
"""
context_dict = {
'context_id': text_type(context_key) if context_key else '',
'context_id': str(context_key) if context_key else '',
'course_id': '',
'org_id': '',
}
if context_key is not None:
assert isinstance(context_key, LearningContextKey)
if context_key.is_course:
context_dict['course_id'] = text_type(context_key)
context_dict['course_id'] = str(context_key)
if hasattr(context_key, 'org'):
context_dict['org_id'] = context_key.org
return context_dict

6
common/djangoapps/track/management/tracked_command.py
View File

@@ -46,8 +46,8 @@ class TrackedCommand(BaseCommand): # lint-amnesty, pylint: disable=abstract-met
def create_parser(self, prog_name, subcommand): # lint-amnesty, pylint: disable=arguments-differ
"""Wraps create_parser to snag command line info."""
self.prog_name = "{} {}".format(prog_name, subcommand)
return super(TrackedCommand, self).create_parser(prog_name, subcommand) # lint-amnesty, pylint: disable=super-with-arguments
self.prog_name = f"{prog_name} {subcommand}"
return super().create_parser(prog_name, subcommand) # lint-amnesty, pylint: disable=super-with-arguments
def execute(self, *args, **options):
"""Wraps base execute() to add command line to tracking context."""
@@ -56,4 +56,4 @@ class TrackedCommand(BaseCommand): # lint-amnesty, pylint: disable=abstract-met
}
COMMAND_CONTEXT_NAME = 'edx.mgmt.command'
with tracker.get_tracker().context(COMMAND_CONTEXT_NAME, context):
super(TrackedCommand, self).execute(*args, **options) # lint-amnesty, pylint: disable=super-with-arguments
super().execute(*args, **options) # lint-amnesty, pylint: disable=super-with-arguments

4
common/djangoapps/track/middleware.py
View File

@@ -138,12 +138,12 @@ class TrackMiddleware(MiddlewareMixin):
'username': self.get_username(request),
'ip': self.get_request_ip_address(request),
}
for header_name, context_key in six.iteritems(META_KEY_TO_CONTEXT_KEY):
for header_name, context_key in META_KEY_TO_CONTEXT_KEY.items():
# HTTP headers may contain Latin1 characters. Decoding using Latin1 encoding here
# avoids encountering UnicodeDecodeError exceptions when these header strings are
# output to tracking logs.
context_value = request.META.get(header_name, '')
if isinstance(context_value, six.binary_type):
if isinstance(context_value, bytes):
context_value = context_value.decode('latin1')
context[context_key] = context_value

6
common/djangoapps/track/shim.py
View File

@@ -16,7 +16,7 @@ CONTEXT_FIELDS_TO_INCLUDE = [
]
class LegacyFieldMappingProcessor(object):
class LegacyFieldMappingProcessor:
"""Ensures all required fields are included in emitted events"""
def __call__(self, event):
@@ -73,7 +73,7 @@ def remove_shim_context(event):
del context[field]
class GoogleAnalyticsProcessor(object):
class GoogleAnalyticsProcessor:
"""Adds course_id as label, and sets nonInteraction property"""
# documentation of fields here: https://segment.com/docs/integrations/google-analytics/
@@ -91,7 +91,7 @@ class GoogleAnalyticsProcessor(object):
return copied_event
class PrefixedEventProcessor(object):
class PrefixedEventProcessor:
"""
Process any events whose name or prefix (ending with a '.') is registered
as an EventTransformer.

4
common/djangoapps/track/tracker.py
View File

@@ -45,7 +45,7 @@ def _initialize_backends_from_django_settings():
config = getattr(settings, 'TRACKING_BACKENDS', {})
for name, values in six.iteritems(config):
for name, values in config.items():
# Ignore empty values to turn-off default tracker backends
if values:
engine = values['ENGINE']
@@ -92,7 +92,7 @@ def send(event):
warnings.warn(
'track.tracker module is deprecated. Please use eventtracking to send events.', DeprecationWarning
)
for name, backend in six.iteritems(backends): # lint-amnesty, pylint: disable=unused-variable
for name, backend in backends.items(): # lint-amnesty, pylint: disable=unused-variable
backend.send(event)

98
common/djangoapps/track/transformers.py
View File

@@ -16,7 +16,7 @@ from opaque_keys.edx.keys import UsageKey
log = logging.getLogger(__name__)
class DottedPathMapping(object):
class DottedPathMapping:
"""
Dictionary-like object for creating keys of dotted paths.
@@ -48,12 +48,12 @@ class DottedPathMapping(object):
def __getitem__(self, key):
if key in self._match_registry:
return self._match_registry[key]
if isinstance(key, six.string_types):
if isinstance(key, str):
# Reverse-sort the keys to find the longest matching prefix.
for prefix in sorted(self._prefix_registry, reverse=True):
if key.startswith(prefix):
return self._prefix_registry[prefix]
raise KeyError('Key {} not found in {}'.format(key, type(self)))
raise KeyError(f'Key {key} not found in {type(self)}')
def __setitem__(self, key, value):
if key.endswith('.'):
@@ -92,7 +92,7 @@ class DottedPathMapping(object):
return list(self._match_registry.keys()) + list(self._prefix_registry.keys())
class EventTransformerRegistry(object):
class EventTransformerRegistry:
"""
Registry to track which EventTransformers handle which events. The
EventTransformer must define a `match_key` attribute which contains the
@@ -119,7 +119,7 @@ class EventTransformerRegistry(object):
If no transformer is registered to handle the event, this raises a
KeyError.
"""
name = event.get(u'name')
name = event.get('name')
return cls.mapping[name](event)
@@ -184,7 +184,7 @@ class EventTransformer(dict):
always be run.
"""
def __init__(self, *args, **kwargs):
super(EventTransformer, self).__init__(*args, **kwargs) # lint-amnesty, pylint: disable=super-with-arguments
super().__init__(*args, **kwargs) # lint-amnesty, pylint: disable=super-with-arguments
self.load_payload()
# Properties to be overridden
@@ -206,14 +206,14 @@ class EventTransformer(dict):
"""
Returns the event's name.
"""
return self[u'name']
return self['name']
@property
def context(self):
"""
Returns the event's context dict.
"""
return self.get(u'context', {})
return self.get('context', {})
# Transform methods
@@ -221,11 +221,11 @@ class EventTransformer(dict):
"""
Create a data version of self[u'event'] at self.event
"""
if u'event' in self:
if isinstance(self[u'event'], six.string_types):
self.event = json.loads(self[u'event'])
if 'event' in self:
if isinstance(self['event'], str):
self.event = json.loads(self['event'])
else:
self.event = self[u'event']
self.event = self['event']
def dump_payload(self):
"""
@@ -233,10 +233,10 @@ class EventTransformer(dict):
Keep the same format we were originally given.
"""
if isinstance(self.get(u'event'), six.string_types):
self[u'event'] = json.dumps(self.event)
if isinstance(self.get('event'), str):
self['event'] = json.dumps(self.event)
else:
self[u'event'] = self.event
self['event'] = self.event
def transform(self):
"""
@@ -277,13 +277,13 @@ class SequenceTabSelectedEventTransformer(EventTransformer):
Transformer to maintain backward compatiblity with seq_goto events.
"""
match_key = u'edx.ui.lms.sequence.tab_selected'
match_key = 'edx.ui.lms.sequence.tab_selected'
is_legacy_event = True
legacy_event_type = u'seq_goto'
legacy_event_type = 'seq_goto'
def process_legacy_fields(self):
self.event[u'old'] = self.event[u'current_tab']
self.event[u'new'] = self.event[u'target_tab']
self.event['old'] = self.event['current_tab']
self.event['new'] = self.event['target_tab']
class _BaseLinearSequenceEventTransformer(EventTransformer):
@@ -308,8 +308,8 @@ class _BaseLinearSequenceEventTransformer(EventTransformer):
old: equal to the new current_tab field
new: the tab to which the user is navigating
"""
self.event[u'old'] = self.event[u'current_tab']
self.event[u'new'] = self.event[u'current_tab'] + self.offset
self.event['old'] = self.event['current_tab']
self.event['new'] = self.event['current_tab'] + self.offset
def crosses_boundary(self):
"""
@@ -325,15 +325,15 @@ class NextSelectedEventTransformer(_BaseLinearSequenceEventTransformer):
Transformer to maintain backward compatiblity with seq_next events.
"""
match_key = u'edx.ui.lms.sequence.next_selected'
match_key = 'edx.ui.lms.sequence.next_selected'
offset = 1
legacy_event_type = u'seq_next'
legacy_event_type = 'seq_next'
def crosses_boundary(self):
"""
Returns true if the navigation moves the focus to the next sequence.
"""
return self.event[u'current_tab'] == self.event[u'tab_count']
return self.event['current_tab'] == self.event['tab_count']
@EventTransformerRegistry.register
@@ -342,16 +342,16 @@ class PreviousSelectedEventTransformer(_BaseLinearSequenceEventTransformer):
Transformer to maintain backward compatiblity with seq_prev events.
"""
match_key = u'edx.ui.lms.sequence.previous_selected'
match_key = 'edx.ui.lms.sequence.previous_selected'
offset = -1
legacy_event_type = u'seq_prev'
legacy_event_type = 'seq_prev'
def crosses_boundary(self):
"""
Returns true if the navigation moves the focus to the previous
sequence.
"""
return self.event[u'current_tab'] == 1
return self.event['current_tab'] == 1
@EventTransformerRegistry.register
@@ -365,19 +365,19 @@ class VideoEventTransformer(EventTransformer):
that converts the events they *can* easily emit and converts them into the
legacy format.
"""
match_key = u'edx.video.'
match_key = 'edx.video.'
name_to_event_type_map = {
u'edx.video.played': u'play_video',
u'edx.video.paused': u'pause_video',
u'edx.video.stopped': u'stop_video',
u'edx.video.loaded': u'load_video',
u'edx.video.position.changed': u'seek_video',
u'edx.video.seeked': u'seek_video',
u'edx.video.transcript.shown': u'show_transcript',
u'edx.video.transcript.hidden': u'hide_transcript',
u'edx.video.language_menu.shown': u'video_show_cc_menu',
u'edx.video.language_menu.hidden': u'video_hide_cc_menu',
'edx.video.played': 'play_video',
'edx.video.paused': 'pause_video',
'edx.video.stopped': 'stop_video',
'edx.video.loaded': 'load_video',
'edx.video.position.changed': 'seek_video',
'edx.video.seeked': 'seek_video',
'edx.video.transcript.shown': 'show_transcript',
'edx.video.transcript.hidden': 'hide_transcript',
'edx.video.language_menu.shown': 'video_show_cc_menu',
'edx.video.language_menu.hidden': 'video_hide_cc_menu',
}
is_legacy_event = True
@@ -395,7 +395,7 @@ class VideoEventTransformer(EventTransformer):
expected types of events.
"""
if self.name in self.name_to_event_type_map:
super(VideoEventTransformer, self).transform() # lint-amnesty, pylint: disable=super-with-arguments
super().transform() # lint-amnesty, pylint: disable=super-with-arguments
def process_event(self):
"""
@@ -480,17 +480,17 @@ class VideoEventTransformer(EventTransformer):
"""
if self._build_requests_plus_30_for_minus_30():
if self._user_requested_plus_30_skip():
self.event[u'requested_skip_interval'] = -30
self.event['requested_skip_interval'] = -30
def _build_requests_plus_30_for_minus_30(self):
"""
Returns True if this build contains the seek bug
"""
if u'application' in self.context:
if all(key in self.context[u'application'] for key in (u'version', u'name')):
app_version = self.context[u'application'][u'version']
app_name = self.context[u'application'][u'name']
return app_version == u'1.0.02' and app_name == u'edx.mobileapp.iOS'
if 'application' in self.context:
if all(key in self.context['application'] for key in ('version', 'name')):
app_version = self.context['application']['version']
app_name = self.context['application']['name']
return app_version == '1.0.02' and app_name == 'edx.mobileapp.iOS'
return False
def _user_requested_plus_30_skip(self):
@@ -498,9 +498,9 @@ class VideoEventTransformer(EventTransformer):
If the user requested a +30 second skip, return True.
"""
if u'requested_skip_interval' in self.event and u'type' in self.event:
interval = self.event[u'requested_skip_interval']
action = self.event[u'type']
return interval == 30 and action == u'onSkipSeek'
if 'requested_skip_interval' in self.event and 'type' in self.event:
interval = self.event['requested_skip_interval']
action = self.event['type']
return interval == 30 and action == 'onSkipSeek'
else:
return False

2
common/djangoapps/track/utils.py
View File

@@ -28,4 +28,4 @@ class DateTimeJSONEncoder(json.JSONEncoder):
elif isinstance(obj, date):
return obj.isoformat()
return super(DateTimeJSONEncoder, self).default(obj) # lint-amnesty, pylint: disable=super-with-arguments
return super().default(obj) # lint-amnesty, pylint: disable=super-with-arguments