#476 fix line length issues

DigitalCampus · Nov 21, 2019 · ce4b7e1 · ce4b7e1
1 parent 538ec80
commit ce4b7e1
Show file tree

Hide file tree

Showing 23 changed files with 386 additions and 173 deletions.
diff --git a/api/resources.py b/api/resources.py
@@ -140,11 +140,13 @@ def obj_create(self, bundle, **kwargs):
         return bundle
 
     def dehydrate_points(self, bundle):
-        points = Points.get_userscore(User.objects.get(username=bundle.request.user.username))
+        points = Points.get_userscore(
+            User.objects.get(username=bundle.request.user.username))
         return points
 
     def dehydrate_badges(self, bundle):
-        badges = Award.get_userawards(User.objects.get(username=bundle.request.user.username))
+        badges = Award.get_userawards(
+            User.objects.get(username=bundle.request.user.username))
         return badges
 
     def dehydrate_scoring(self, bundle):
@@ -158,8 +160,11 @@ def dehydrate_metadata(self, bundle):
 
     def dehydrate_course_points(self, bundle):
         course_points = list(
-            Points.objects.exclude(course=None).filter(user=bundle.request.user).values('course__shortname').annotate(
-                total_points=Sum('points')))
+            Points.objects
+                .exclude(course=None)
+                .filter(user=bundle.request.user)
+                .values('course__shortname')
+                .annotate(total_points=Sum('points')))
         return course_points
 
 
@@ -183,8 +188,9 @@ class Meta:
         include_resource_uri = False
 
     def obj_create(self, bundle, **kwargs):
-        self_register = SettingProperties.get_int(constants.OPPIA_ALLOW_SELF_REGISTRATION,
-                                                  settings.OPPIA_ALLOW_SELF_REGISTRATION)
+        self_register = SettingProperties \
+            .get_int(constants.OPPIA_ALLOW_SELF_REGISTRATION,
+                     settings.OPPIA_ALLOW_SELF_REGISTRATION)
         if not self_register:
             raise BadRequest(_(u'Registration is disabled on this server.'))
         required = ['username',
@@ -245,19 +251,23 @@ def obj_create(self, bundle, **kwargs):
             key = ApiKey.objects.get(user=u)
             bundle.data['api_key'] = key.key
         except IntegrityError:
-            raise BadRequest(_(u'Username "%s" already in use, please select another' % username))
+            raise BadRequest(
+                _(u'Username "%s" already in use, please select another'
+                  % username))
         del bundle.data['passwordagain']
         del bundle.data['password']
         del bundle.data['firstname']
         del bundle.data['lastname']
         return bundle
 
     def dehydrate_points(self, bundle):
-        points = Points.get_userscore(User.objects.get(username__exact=bundle.data['username']))
+        points = Points.get_userscore(User.objects.get(
+            username__exact=bundle.data['username']))
         return points
 
     def dehydrate_badges(self, bundle):
-        badges = Award.get_userawards(User.objects.get(username__exact=bundle.data['username']))
+        badges = Award.get_userawards(User.objects.get(
+            username__exact=bundle.data['username']))
         return badges
 
     def dehydrate_scoring(self, bundle):
@@ -419,7 +429,8 @@ def process_tracker_bundle(self, bundle):
 
     def hydrate(self, bundle, request=None):
 
-        # remove any id if this is submitted - otherwise it may overwrite existing tracker item
+        # remove any id if this is submitted - otherwise it may overwrite
+        # existing tracker item
         if 'id' in bundle.data:
             del bundle.obj.id
         bundle.obj.user = bundle.request.user
@@ -437,10 +448,12 @@ def hydrate(self, bundle, request=None):
         # find out the course & activity type from the digest
         try:
             if 'course' in bundle.data:
-                activities = Activity.objects.filter(digest=bundle.data['digest'],
-                                                     section__course__shortname=bundle.data['course'])[:1]
+                activities = Activity.objects \
+                    .filter(digest=bundle.data['digest'],
+                            section__course__shortname=bundle.data['course'])[:1]
             else:
-                activities = Activity.objects.filter(digest=bundle.data['digest'])[:1]
+                activities = Activity.objects.filter(
+                    digest=bundle.data['digest'])[:1]
             if activities.count() > 0:
                 activity = activities[0]
                 bundle.obj.course = activity.section.course
@@ -465,7 +478,8 @@ def hydrate(self, bundle, request=None):
     def hydrate_tracker_date(self, bundle, request=None, **kwargs):
         # Fix tracker date if date submitted is in the future
         if 'tracker_date' in bundle.data:
-            tracker_date = dateparse.parse_datetime(bundle.data['tracker_date'])
+            tracker_date = dateparse.parse_datetime(
+                bundle.data['tracker_date'])
             if tracker_date > datetime.datetime.now():
                 bundle.data['tracker_date'] = timezone.now()
 
@@ -490,8 +504,10 @@ def dehydrate_metadata(self, bundle):
 
     def dehydrate_course_points(self, bundle):
         course_points = list(
-            Points.objects.exclude(course=None).filter(user=bundle.request.user).values('course__shortname').annotate(
-                total_points=Sum('points')))
+            Points.objects.exclude(course=None)
+                .filter(user=bundle.request.user)
+                .values('course__shortname')
+                .annotate(total_points=Sum('points')))
         return course_points
 
     def patch_list(self, request, **kwargs):

diff --git a/av/forms.py b/av/forms.py
@@ -50,12 +50,12 @@ def clean(self):
         media_file = cleaned_data.get("media_file")
 
         if media_file is not None \
-                and media_file.content_type not in settings.OPPIA_MEDIA_FILE_TYPES:
-            raise forms.ValidationError(_(u"You may only upload a media file \
-                                         which is one of the following types: \
-                                          %s"
-                                          % ', '
-                                          .join(settings.OPPIA_MEDIA_FILE_TYPES)))
+                and media_file.content_type  \
+                not in settings.OPPIA_MEDIA_FILE_TYPES:
+            raise forms.ValidationError(
+                _(u"You may only upload a media file \
+                  which is one of the following types: %s" % ', '
+                  .join(settings.OPPIA_MEDIA_FILE_TYPES)))
 
         '''
         check this file hasn't already been uploaded
@@ -77,8 +77,13 @@ def clean(self):
         if media.count() > 0:
             url = reverse('oppia_av_view', args=[media.first().id])
             raise forms.ValidationError({
-                'media_file': mark_safe(_(u"This media file has already been \
-                                         uploaded. <a href='%s'>View the original upload</a>." % url)),
-                'embed_code': media.first().get_embed_code(self.request.build_absolute_uri(media.first().file.url))
+                'media_file':
+                    mark_safe(
+                        _(u"This media file has already been uploaded. \
+                          <a href='%s'>View the original upload</a>." % url)),
+                'embed_code':
+                    media.first()
+                         .get_embed_code(self.request.build_absolute_uri(
+                             media.first().file.url))
                 })
         return cleaned_data
diff --git a/av/views.py b/av/views.py
@@ -43,7 +43,8 @@ def upload_view(request):
         result = handler.upload(request, request.user)
 
         if result['result'] == UploadedMedia.UPLOAD_STATUS_SUCCESS:
-            return HttpResponseRedirect(reverse('oppia_av_upload_success', args=[result['media'].id]))
+            return HttpResponseRedirect(reverse('oppia_av_upload_success',
+                                                args=[result['media'].id]))
         else:
             form = result['form']
     else:
@@ -58,7 +59,8 @@ def upload_view(request):
 def upload_success_view(request, id):
     media = get_object_or_404(UploadedMedia, pk=id)
 
-    embed_code = media.get_embed_code(request.build_absolute_uri(media.file.url))
+    embed_code = media.get_embed_code(
+        request.build_absolute_uri(media.file.url))
 
     return render(request, 'av/upload_success.html',
                   {'title': _(u'Upload Media'),
@@ -70,7 +72,8 @@ def upload_success_view(request, id):
 def media_view(request, id):
     media = get_object_or_404(UploadedMedia, pk=id)
 
-    embed_code = media.get_embed_code(request.build_absolute_uri(media.file.url))
+    embed_code = media.get_embed_code(
+        request.build_absolute_uri(media.file.url))
 
     return render(request, 'av/view.html',
                   {'title': _(u'Media'),

diff --git a/content/urls.py b/content/urls.py
@@ -4,6 +4,10 @@
 from content import views as oppia_content_views
 
 urlpatterns = [
-                url(r'^video-embed-helper/$', oppia_content_views.media_embed_helper, name="oppia_video_embed_helper"),
-                url(r'^media-embed-helper/$', oppia_content_views.media_embed_helper, name="oppia_media_embed_helper"),
+                url(r'^video-embed-helper/$',
+                    oppia_content_views.media_embed_helper,
+                    name="oppia_video_embed_helper"),
+                url(r'^media-embed-helper/$',
+                    oppia_content_views.media_embed_helper,
+                    name="oppia_media_embed_helper"),
         ]
diff --git a/oppia/migrations/0013_auto_20180413_1611.py b/oppia/migrations/0013_auto_20180413_1611.py
@@ -15,6 +15,10 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='tracker',
             name='uuid',
-            field=models.CharField(blank=True, db_index=True, default=None, max_length=100, null=True),
+            field=models.CharField(blank=True,
+                                   db_index=True,
+                                   default=None,
+                                   max_length=100,
+                                   null=True),
         ),
     ]
diff --git a/oppia/migrations/0021_auto_20191025_2243.py b/oppia/migrations/0021_auto_20191025_2243.py
@@ -14,7 +14,10 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='coursepublishinglog',
             name='course',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='oppia.Course'),
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to='oppia.Course'),
         ),
         migrations.AlterField(
             model_name='coursepublishinglog',

diff --git a/oppia/models/cohorts.py b/oppia/models/cohorts.py
@@ -24,27 +24,34 @@ def __str__(self):
         return self.description
 
     def no_student_members(self):
-        return Participant.objects.filter(cohort=self, role=Participant.STUDENT).count()
+        return Participant.objects.filter(cohort=self,
+                                          role=Participant.STUDENT).count()
 
     def no_teacher_members(self):
-        return Participant.objects.filter(cohort=self, role=Participant.TEACHER).count()
+        return Participant.objects.filter(cohort=self,
+                                          role=Participant.TEACHER).count()
 
     def get_courses(self):
-        courses = Course.objects.filter(coursecohort__cohort=self).order_by('title')
+        courses = Course.objects \
+            .filter(coursecohort__cohort=self).order_by('title')
         return courses
 
     def get_leaderboard(self, count=0):
-        users = User.objects.filter(participant__cohort=self,
-                                    participant__role=Participant.STUDENT,
-                                    points__course__coursecohort__cohort=self) \
+        users = User.objects \
+            .filter(participant__cohort=self,
+                    participant__role=Participant.STUDENT,
+                    points__course__coursecohort__cohort=self) \
             .annotate(total=Sum('points__points')) \
             .order_by('-total')
 
         if count != 0:
             users = users[:count]
 
         for u in users:
-            u.badges = Award.objects.filter(user=u, awardcourse__course__coursecohort__cohort=self).count()
+            u.badges = Award.objects \
+                .filter(user=u,
+                        awardcourse__course__coursecohort__cohort=self) \
+                .count()
             if u.total is None:
                 u.total = 0
         return users