From ba65b65f20f14b90495f8de0f5dd2821f1609b7c Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Mon, 10 Aug 2020 20:41:07 -0400 Subject: [PATCH] Pylint fix figures after reverting to pylint 1.7.1 edx-lint 0.5.5 requires pylint 1.7.1. Not sure why this error is happening now, since we've edx-lint 0.5.5 and pylint 1.9.5 have been coexisting in Figures for a while --- figures/models.py | 8 ++--- figures/pipeline/enrollment_metrics.py | 2 +- figures/views.py | 44 +++++++++++++------------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/figures/models.py b/figures/models.py index 981e1464..d7abf3af 100644 --- a/figures/models.py +++ b/figures/models.py @@ -191,7 +191,7 @@ class LearnerCourseGradeMetricsManager(models.Manager): def most_recent_for_learner_course(self, user, course_id): queryset = self.filter(user=user, course_id=str(course_id)) if queryset: - return queryset.order_by('-date_for')[0] # pylint: disable=E1101 + return queryset.order_by('-date_for')[0] else: return None @@ -234,7 +234,7 @@ def completed_for_site(self, site, **_kwargs): # We do the string casting in case couse_ids are CourseKey instance filter_args['course_id__in'] = [str(key) for key in course_ids] if filter_args: - qs = qs.filter(**filter_args) # pylint: disable=E1101 + qs = qs.filter(**filter_args) return qs def completed_ids_for_site(self, site, **_kwargs): @@ -400,7 +400,7 @@ def latest_for_site_month(self, site, year, month): If no record found, returns 'None' """ queryset = self.filter(site=site, date_for__year=year, date_for__month=month) - return queryset.order_by('-modified').first() # pylint: disable=no-member + return queryset.order_by('-modified').first() @python_2_unicode_compatible @@ -450,7 +450,7 @@ def latest_for_course_month(self, site, course_id, year, month): date_for__year=year, date_for__month=month, ) - return queryset.order_by('-modified').first() # pylint: disable=no-member + return queryset.order_by('-modified').first() @python_2_unicode_compatible diff --git a/figures/pipeline/enrollment_metrics.py b/figures/pipeline/enrollment_metrics.py index 3d448eae..7aec49a9 100644 --- a/figures/pipeline/enrollment_metrics.py +++ b/figures/pipeline/enrollment_metrics.py @@ -166,7 +166,7 @@ def collect_metrics_for_enrollment(site, course_enrollment, course_sm, date_for= lcgm = LearnerCourseGradeMetrics.objects.filter( user=course_enrollment.user, course_id=str(course_enrollment.course_id)) - most_recent_lcgm = lcgm.order_by('date_for').last() # pylint: disable=E1101 + most_recent_lcgm = lcgm.order_by('date_for').last() if _enrollment_metrics_needs_update(most_recent_lcgm, most_recent_sm): progress_data = _collect_progress_data(most_recent_sm) diff --git a/figures/views.py b/figures/views.py index b0381904..7e159cc2 100644 --- a/figures/views.py +++ b/figures/views.py @@ -428,7 +428,7 @@ def completed_ids(self, request): The default router does not support hyphen in the custom action, so we need to use the underscore until we implement a custom router """ - site = django.contrib.sites.shortcuts.get_current_site(self.request) + site = django.contrib.sites.shortcuts.get_current_site(request) qs = self.model.objects.completed_ids_for_site(site=site) page = self.paginate_queryset(qs) if page is not None: @@ -446,7 +446,7 @@ def completed(self, request): Return matching LearnerCourseGradeMetric rows that have completed enrollments """ - site = django.contrib.sites.shortcuts.get_current_site(self.request) + site = django.contrib.sites.shortcuts.get_current_site(request) qs = self.model.objects.completed_for_site(site=site) page = self.paginate_queryset(qs) if page is not None: @@ -505,7 +505,7 @@ def list(self, request): TODO: NEXT Add query params to get data from previous months TODO: Add paginagation """ - site = django.contrib.sites.shortcuts.get_current_site(self.request) + site = django.contrib.sites.shortcuts.get_current_site(request) course_keys = figures.sites.get_course_keys_for_site(site) date_for = datetime.utcnow().date() month_for = '{}/{}'.format(date_for.month, date_for.year) @@ -516,7 +516,7 @@ def list(self, request): month_for=month_for)) return Response(data) - def retrieve(self, request, *args, **kwargs): + def retrieve(self, request, **kwargs): # pylint: disable=unused-argument """ TODO: Make sure we have a test to handle invalid or empty course id """ @@ -530,7 +530,7 @@ def retrieve(self, request, *args, **kwargs): return Response(data) @detail_route() - def active_users(self, request, **kwargs): + def active_users(self, request, **kwargs): # pylint: disable=unused-argument site, course_id = self.site_course_helper(kwargs.get('pk', '')) date_for = datetime.utcnow().date() months_back = 6 @@ -544,7 +544,7 @@ def active_users(self, request, **kwargs): return Response(data) @detail_route() - def course_enrollments(self, request, *args, **kwargs): + def course_enrollments(self, request, **kwargs): site, course_id = self.site_course_helper(kwargs.get('pk', '')) data = dict(course_enrollments=self.historic_data( request=request, @@ -554,7 +554,7 @@ def course_enrollments(self, request, *args, **kwargs): return Response(data) @detail_route() - def num_learners_completed(self, request, *args, **kwargs): + def num_learners_completed(self, request, **kwargs): site, course_id = self.site_course_helper(kwargs.get('pk', '')) data = dict(num_learners_completed=self.historic_data( request=request, @@ -564,7 +564,7 @@ def num_learners_completed(self, request, *args, **kwargs): return Response(data) @detail_route() - def avg_days_to_complete(self, request, *args, **kwargs): + def avg_days_to_complete(self, request, **kwargs): site, course_id = self.site_course_helper(kwargs.get('pk', '')) data = dict(avg_days_to_complete=self.historic_data( request=request, @@ -574,7 +574,7 @@ def avg_days_to_complete(self, request, *args, **kwargs): return Response(data) @detail_route() - def avg_progress(self, request, *args, **kwargs): + def avg_progress(self, request, **kwargs): site, course_id = self.site_course_helper(kwargs.get('pk', '')) data = dict(avg_progress=self.historic_data( request=request, @@ -606,13 +606,13 @@ def list(self, request): Returns site metrics data for current month """ - site = django.contrib.sites.shortcuts.get_current_site(self.request) + site = django.contrib.sites.shortcuts.get_current_site(request) data = metrics.get_current_month_site_metrics(site) return Response(data) @list_route() def registered_users(self, request): - site = django.contrib.sites.shortcuts.get_current_site(self.request) + site = django.contrib.sites.shortcuts.get_current_site(request) date_for = datetime.utcnow().date() months_back = 6 @@ -630,7 +630,7 @@ def new_users(self, request): """ TODO: Rename the metrics module function to "new_users" to match this """ - site = django.contrib.sites.shortcuts.get_current_site(self.request) + site = django.contrib.sites.shortcuts.get_current_site(request) date_for = datetime.utcnow().date() months_back = 6 @@ -645,7 +645,7 @@ def new_users(self, request): @list_route() def course_completions(self, request): - site = django.contrib.sites.shortcuts.get_current_site(self.request) + site = django.contrib.sites.shortcuts.get_current_site(request) date_for = datetime.utcnow().date() months_back = 6 @@ -660,7 +660,7 @@ def course_completions(self, request): @list_route() def course_enrollments(self, request): - site = django.contrib.sites.shortcuts.get_current_site(self.request) + site = django.contrib.sites.shortcuts.get_current_site(request) date_for = datetime.utcnow().date() months_back = 6 @@ -675,7 +675,7 @@ def course_enrollments(self, request): @list_route() def site_courses(self, request): - site = django.contrib.sites.shortcuts.get_current_site(self.request) + site = django.contrib.sites.shortcuts.get_current_site(request) date_for = datetime.utcnow().date() months_back = 6 @@ -690,7 +690,7 @@ def site_courses(self, request): @list_route() def active_users(self, request): - site = django.contrib.sites.shortcuts.get_current_site(self.request) + site = django.contrib.sites.shortcuts.get_current_site(request) months_back = 6 active_users = metrics.get_site_mau_history_metrics(site=site, months_back=months_back) @@ -707,10 +707,10 @@ def get_queryset(self): """ pass - def retrieve(self, request, *args, **kwargs): + def retrieve(self, request, **kwargs): course_id_str = kwargs.get('pk', '') course_key = CourseKey.from_string(course_id_str.replace(' ', '+')) - site = django.contrib.sites.shortcuts.get_current_site(self.request) + site = django.contrib.sites.shortcuts.get_current_site(request) if figures.helpers.is_multisite(): if site != figures.sites.get_site_for_course(course_key): @@ -720,8 +720,8 @@ def retrieve(self, request, *args, **kwargs): serializer = self.serializer_class(data) return Response(serializer.data) - def list(self, request, *args, **kwargs): - site = django.contrib.sites.shortcuts.get_current_site(self.request) + def list(self, request): + site = django.contrib.sites.shortcuts.get_current_site(request) course_overviews = figures.sites.get_courses_for_site(site) data = [] for co in course_overviews: @@ -747,12 +747,12 @@ def get_queryset(self): """ pass - def list(self, request, *args, **kwargs): + def list(self, request): """ We use list instead of retrieve because retrieve requires a resource identifier, like a PK """ - site = django.contrib.sites.shortcuts.get_current_site(self.request) + site = django.contrib.sites.shortcuts.get_current_site(request) data = retrieve_live_site_mau_data(site) serializer = self.serializer_class(data) return Response(serializer.data)