#476 fix line length issues

activitylog/forms.py

@@ -16,8 +16,9 @@ class UploadActivityLogForm(forms.Form):
                             .join(settings.OPPIA_UPLOAD_TRACKER_FILE_TYPES)),
                 required=True,
                 label=_(u'Activity Log'),
-                error_messages={'required':
-                                _(u'Please select an activity log file to upload')},
+                error_messages={
+                    'required':
+                    _(u'Please select an activity log file to upload')},
                 )
 
     def __init__(self, *args, **kwargs):
@@ -44,4 +45,5 @@ def clean(self):
                 not in settings.OPPIA_UPLOAD_TRACKER_FILE_TYPES:
             raise forms.ValidationError(
                 _(u"You may only upload an activity log file which is one of \
-                  the following types: %s" % ', '.join(settings.OPPIA_UPLOAD_TRACKER_FILE_TYPES)))
+                  the following types: %s"
+                  % ', '.join(settings.OPPIA_UPLOAD_TRACKER_FILE_TYPES)))

activitylog/migrations/0002_auto_20190321_0755.py

@@ -14,7 +14,8 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='uploadedactivitylog',
             name='created_date',
-            field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='date created'),
+            field=models.DateTimeField(default=django.utils.timezone.now,
+                                       verbose_name='date created'),
         ),
         migrations.AlterField(
             model_name='uploadedactivitylog',
@@ -24,6 +25,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='uploadedactivitylog',
             name='lastupdated_date',
-            field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='date updated'),
+            field=models.DateTimeField(default=django.utils.timezone.now,
+                                       verbose_name='date updated'),
         ),
     ]

activitylog/models.py

@@ -13,9 +13,12 @@
 
 class UploadedActivityLog(models.Model):
 
-    create_user = models.ForeignKey(User, related_name='activitylog_create_user', on_delete=models.CASCADE)
+    create_user = models.ForeignKey(User,
+                                    related_name='activitylog_create_user',
+                                    on_delete=models.CASCADE)
     created_date = models.DateTimeField('date created', default=timezone.now)
-    lastupdated_date = models.DateTimeField('date updated', default=timezone.now)
+    lastupdated_date = models.DateTimeField('date updated',
+                                            default=timezone.now)
     file = models.FileField(upload_to="activitylog/%Y/%m/", blank=False)
 
     class Meta:

activitylog/views.py

@@ -87,21 +87,23 @@ def process_uploaded_file(request, json_data):
                     if 'organisation' in user else None
                 user_profile.save()
 
-                messages.warning(request, _(
-                    u"%(username)s did not exist previously, and was created." % {
-                        'username': username}), 'danger')
+                messages.warning(request,
+                                 _(u"%(username)s did not exist previously, \
+                                   and was created." % {'username': username}),
+                                 'danger')
             else:
                 req_user = User.objects.filter(username=username).first()
 
             try:
                 user_api_key, created = ApiKey.objects \
                     .get_or_create(user=req_user)
                 if (created):
-                    messages.warning(request, _(
-                        u"Generated new ApiKey for %(username)s : %(apikey)s" % {
-                            'username': username,
-                            'apikey': user_api_key.key}),
-                        'danger')
+                    messages.warning(request,
+                                     _(u"Generated new ApiKey for \
+                                       %(username)s : %(apikey)s" % {
+                                           'username': username,
+                                           'apikey': user_api_key.key}),
+                                     'danger')
 
                 if 'trackers' in user:
                     process_uploaded_trackers(request,
@@ -114,8 +116,12 @@ def process_uploaded_file(request, json_data):
                                                    req_user,
                                                    user_api_key)
             except ApiKey.DoesNotExist:
-                messages.warning(request, _(u"%(username)s not found. Please \
-                check that this file is being uploaded to the correct server." % {'username': username}), 'danger')
+                messages.warning(request,
+                                 _(u"%(username)s not found. Please \
+                                   check that this file is being uploaded to \
+                                   the correct server."
+                                   % {'username': username}),
+                                 'danger')
                 print(_(u"No user api key found for %s" % user['username']))
 
 

av/admin.py

@@ -9,7 +9,11 @@ class UploadedMediaAdmin(admin.ModelAdmin):
 
 
 class UploadedMediaImageAdmin(admin.ModelAdmin):
-    list_display = ('id', 'image', 'uploaded_media', 'default_image', 'created_date')
+    list_display = ('id',
+                    'image',
+                    'uploaded_media',
+                    'default_image',
+                    'created_date')
 
 
 admin.site.register(UploadedMedia, UploadedMediaAdmin)

av/handler.py

@@ -36,26 +36,31 @@ def upload(request, user):
             most likely means settings.MEDIA_PROCESSOR_PROGRAM is not installed
             '''
             uploaded_media.delete()
-            messages.add_message(request,
-                                 messages.ERROR,
-                                 _(u"The %s program does not seem to be \
-                                   installed on this server, or is \
-                                   incorrectly configured. Please ask your \
-                                   Oppia system administrator to install it \
-                                   for you.") % settings.MEDIA_PROCESSOR_PROGRAM, "danger")
+            messages.add_message(
+                request,
+                messages.ERROR,
+                _(u"The %s program does not seem to be \
+                  installed on this server, or is \
+                  incorrectly configured. Please ask your \
+                  Oppia system administrator to install it \
+                  for you.") % settings.MEDIA_PROCESSOR_PROGRAM, "danger")
             return {'result': UploadedMedia.UPLOAD_STATUS_FAILURE,
                     'form': form,
-                    'errors': _(u"The %s program might not be installed on \
-                                this server.") % settings.MEDIA_PROCESSOR_PROGRAM}
+                    'errors':
+                        _(u"The %s program might not be installed on \
+                          this server.") % settings.MEDIA_PROCESSOR_PROGRAM}
 
-        return {'result': UploadedMedia.UPLOAD_STATUS_SUCCESS, 'media': uploaded_media}
+        return {'result': UploadedMedia.UPLOAD_STATUS_SUCCESS,
+                'media': uploaded_media}
     else:
 
         errors = []
         for field, error in form.errors.items():
             for e in error:
                 errors.append(e)
-        return {'result': UploadedMedia.UPLOAD_STATUS_FAILURE, 'form': form, 'errors': errors}
+        return {'result': UploadedMedia.UPLOAD_STATUS_FAILURE,
+                'form': form,
+                'errors': errors}
 
 
 def get_length(filepath):

av/management/commands/generate_media_images.py

@@ -39,8 +39,9 @@ def handle(self, *args, **options):
                 self.stdout.write("  > Created output dir " + cache_dir)
 
             self.stdout.write("  > Generating miniatures... \r", )
-            image_generator_command = ("%s %s" % (settings.SCREENSHOT_GENERATOR_PROGRAM,
-                                                  settings.SCREENSHOT_GENERATOR_PROGRAM_PARAMS)) \
+            image_generator_command = (
+                "%s %s" % (settings.SCREENSHOT_GENERATOR_PROGRAM,
+                           settings.SCREENSHOT_GENERATOR_PROGRAM_PARAMS)) \
                 % (m.file.path,
                    content.SCREENSHOT_IMAGE_WIDTH,
                    content.SCREENSHOT_IMAGE_HEIGHT,

av/management/commands/media_url_check.py

@@ -32,8 +32,13 @@ def handle(self, *args, **options):
                 if m.filesize is not None:
                     total_size = int(response.getheader('content-length'))
                     if total_size != m.filesize:
-                        self.stdout.write("INFO: file sizes appear to be different:")
-                        self.stdout.write("filesize recorded in db:" + m.filesize)
-                        self.stdout.write("filesize of download url:" + total_size)
+                        self.stdout \
+                            .write("INFO: file sizes appear to be different:")
+                        self.stdout \
+                            .write("filesize recorded in db:" + m.filesize)
+                        self.stdout \
+                            .write("filesize of download url:" + total_size)
             except urllib.error.HTTPError:
-                self.stdout.write("WARNING: media file not found at: " + m.download_url)
+                self.stdout \
+                    .write("WARNING: media file not found at: "
+                           + m.download_url)

av/migrations/0005_auto_20180424_1709.py

@@ -33,8 +33,8 @@ class Migration(migrations.Migration):
                 ('default_image', models.BooleanField(default=False)),
                 ('create_user', models.ForeignKey(
                     on_delete=django.db.models.deletion.CASCADE,
-                  related_name='media_image_create_user',
-                  to=settings.AUTH_USER_MODEL)),
+                    related_name='media_image_create_user',
+                    to=settings.AUTH_USER_MODEL)),
             ],
             options={
                 'verbose_name': 'Uploaded Media Image',

gamification/views.py

@@ -193,13 +193,13 @@ def edit_course_gamification(request, course_id):
 
     default_points = {
         'course': DefaultGamificationEvent.objects
-                    .exclude(level=DefaultGamificationEvent.GLOBAL),
+        .exclude(level=DefaultGamificationEvent.GLOBAL),
         'activity': DefaultGamificationEvent.objects
-                    .filter(level=DefaultGamificationEvent.ACTIVITY),
+        .filter(level=DefaultGamificationEvent.ACTIVITY),
         'quiz': DefaultGamificationEvent.objects
-                    .filter(level=DefaultGamificationEvent.QUIZ),
+        .filter(level=DefaultGamificationEvent.QUIZ),
         'media': DefaultGamificationEvent.objects
-                    .filter(level=DefaultGamificationEvent.MEDIA)
+        .filter(level=DefaultGamificationEvent.MEDIA)
     }
 
     course_events = CourseGamificationEvent.objects.filter(course=course)

helpers/forms/dates.py

@@ -64,15 +64,16 @@ def clean(self):
         try:
             end_date = datetime.datetime.strptime(end_date, "%Y-%m-%d")
         except TypeError:
-            raise forms.ValidationError("Please enter a valid end date.")
+            raise forms.ValidationError(_("Please enter a valid end date."))
 
         # check end date on or before today
         if end_date > datetime.datetime.now():
-            raise forms.ValidationError("End date can't be in the future.")
+            raise forms.ValidationError(_("End date can't be in the future."))
 
         # check start date before end date
         if start_date > end_date:
-            raise forms.ValidationError("Start date must be before the end date.")
+            raise forms.ValidationError(
+                _("Start date must be before the end date."))
 
         return cleaned_data
 
@@ -110,18 +111,19 @@ def clean(self):
         try:
             start_date = datetime.datetime.strptime(start_date, "%Y-%m-%d")
         except TypeError:
-            raise forms.ValidationError("Please enter a valid start date.")
+            raise forms.ValidationError(_("Please enter a valid start date."))
         try:
             end_date = datetime.datetime.strptime(end_date, "%Y-%m-%d")
         except TypeError:
-            raise forms.ValidationError("Please enter a valid end date.")
+            raise forms.ValidationError(_("Please enter a valid end date."))
 
         # check end date on or before today
         if end_date > datetime.datetime.now():
-            raise forms.ValidationError("End date can't be in the future.")
+            raise forms.ValidationError(_("End date can't be in the future."))
 
         # check start date before end date
         if start_date > end_date:
-            raise forms.ValidationError("Start date must be before the end date.")
+            raise forms.ValidationError(
+                _("Start date must be before the end date."))
 
         return cleaned_data

helpers/templatetags/sort_link.py

@@ -6,7 +6,8 @@
 
 @register.inclusion_tag('common/sort-link.html', takes_context=True)
 def sort_link(context, attr_name, attr_title):
-    ordering = context["page_ordering"] if ("page_ordering" in context) else None
+    ordering = context["page_ordering"] \
+        if ("page_ordering" in context) else None
     inverse_order = ordering is not None and ordering.startswith('-')
     if inverse_order:
         ordering = ordering[1:]

integrations/xapi/urls.py

@@ -6,5 +6,7 @@
 
 urlpatterns = [
         url(r'^$', xapi_views.home, name="oppia_integrations_xapi_home"),
-        url(r'^export/$', xapi_views.csv_export, name="oppia_integrations_xapi_csv_export"),
+        url(r'^export/$',
+            xapi_views.csv_export,
+            name="oppia_integrations_xapi_csv_export"),
 ]

profile/forms/delete.py

@@ -9,10 +9,13 @@
 
 
 class DeleteAccountForm(forms.Form):
-    username = forms.CharField(widget=forms.TextInput(attrs={'readonly': 'readonly'}),
+    username = forms.CharField(widget=forms.TextInput(attrs={'readonly':
+                                                             'readonly'}),
                                required=True)
     password = forms.CharField(widget=forms.PasswordInput,
-                               error_messages={'required': _(u'Please enter your password.'), },
+                               error_messages={
+                                   'required':
+                                   _(u'Please enter your password.')},
                                required=True)
 
     def __init__(self, *args, **kwargs):
@@ -26,7 +29,9 @@ def __init__(self, *args, **kwargs):
             'username',
             'password',
             Div(
-                Submit('submit', _(u'Delete Account'), css_class='btn btn-default'),
+                Submit('submit',
+                       _(u'Delete Account'),
+                       css_class='btn btn-default'),
                 HTML("""<a role="button" class="btn btn-default"
                         href="{% url "profile_edit" %}">Cancel</a>"""),
                 css_class='col-lg-offset-2 col-lg-4',
@@ -41,5 +46,6 @@ def clean(self):
 
         user = authenticate(username=username, password=password)
         if user is None or not user.is_active:
-            raise forms.ValidationError(_(u"Invalid password. Please try again."))
+            raise forms.ValidationError(
+                _(u"Invalid password. Please try again."))
         return cleaned_data

profile/models.py

@@ -27,7 +27,8 @@ def get_can_upload_activitylog(self):
     def is_student_only(self):
         if self.user.is_staff:
             return False
-        teach = Participant.objects.filter(user=self.user, role=Participant.TEACHER).count()
+        teach = Participant.objects.filter(user=self.user,
+                                           role=Participant.TEACHER).count()
         if teach > 0:
             return False
         else:
@@ -36,7 +37,8 @@ def is_student_only(self):
     def is_teacher_only(self):
         if self.user.is_staff:
             return False
-        teach = Participant.objects.filter(user=self.user, role=Participant.TEACHER).count()
+        teach = Participant.objects.filter(user=self.user,
+                                           role=Participant.TEACHER).count()
         if teach > 0:
             return True
         else:

profile/views.py

@@ -413,7 +413,8 @@ def user_course_activity_view(request, user_id, course_id):
                 course_pretest = first_score
             else:
                 quizzes_attempted += 1
-                quizzes_passed = (quizzes_passed + 1) if passed else quizzes_passed
+                quizzes_passed = (quizzes_passed + 1) \
+                    if passed else quizzes_passed
 
         else:
             max_score = None
@@ -528,7 +529,8 @@ def upload_view(request):
                         result['username'] = row['username']
                         result['created'] = True
                         if auto_password:
-                            result['message'] = _(u'User created with password: %s' % password)
+                            result['message'] = \
+                                _(u'User created with password: %s' % password)
                         else:
                             result['message'] = _(u'User created')
                         results.append(result)
@@ -732,7 +734,9 @@ def get_tracker_activities(start_date,
 
     for i in range(0, no_days, +1):
         temp = start_date + datetime.timedelta(days=i)
-        count = next((dct['count'] for dct in trackers if dct['activity_date'] == temp.date()), 0)
+        count = next((dct['count']
+                      for dct in trackers
+                      if dct['activity_date'] == temp.date()), 0)
         activity.append([temp.strftime("%d %b %Y"), count])
 
     return activity

reports/migrations/0001_initial.py

@@ -29,11 +29,12 @@ class Migration(migrations.Migration):
                 ('url', models.TextField(blank=True)),
                 ('data', models.TextField(blank=True)),
                 ('user',
-                 models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL,
-                                   default=None,
-                                   blank=True,
-                                   to=settings.AUTH_USER_MODEL,
-                                   null=True)),
+                 models.ForeignKey(
+                     on_delete=django.db.models.deletion.SET_NULL,
+                     default=None,
+                     blank=True,
+                     to=settings.AUTH_USER_MODEL,
+                     null=True)),
             ],
         ),
     ]

reports/migrations/0002_auto_20160203_0922.py

@@ -14,6 +14,8 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='dashboardaccesslog',
             name='ip',
-            field=models.GenericIPAddressField(default=None, null=True, blank=True),
+            field=models.GenericIPAddressField(default=None,
+                                               null=True,
+                                               blank=True),
         ),
     ]