fix pep8 in mainapp

.github/workflows/ci-checks.yaml

@@ -23,7 +23,7 @@ jobs:
           pip install -r requirements.dev.txt
       - name: Lint with flake8
         run: |
-          flake8 --extend-ignore=E501,E800 FreeItLessons/
+          pep8 mainapp/ --ignore=E501
       - name: Test with unittest
         run: |
           pip3 install ddt

Makefile

@@ -7,6 +7,7 @@ install:
 	pip3 install -r requirements.txt
 
 ci:
+	pep8 mainapp/ --ignore=E501
 	pip3 install ddt
 	python3 manage.py test tests
 

mainapp/admin.py

@@ -1,7 +1,8 @@
+from adminsortable2.admin import SortableAdminMixin
 from django.contrib import admin
+
 from mainapp.models import Author, Module, Chapter, \
-                           Content, Curiosity, ContentStatus, Faq, Task, TaskSolution
-from adminsortable2.admin import SortableAdminMixin, SortableInlineAdminMixin
+    Content, Curiosity, ContentStatus, Faq, Task, TaskSolution
 
 
 class AuthorAdmin(admin.ModelAdmin):
@@ -57,18 +58,21 @@ def save_model(self, request, obj, form, change):
 
 
 class ContentStatusAdmin(admin.ModelAdmin):
-    list_filter = ('status', 'user')    
-    list_display = ('id', 'status', 'view_content_link', 'user', 'created_at', 'updated_at', )
+    list_filter = ('status', 'user')
+    list_display = ('id', 'status', 'view_content_link', 'user', 'created_at', 'updated_at',)
     ordering = ('-updated_at',)
 
     def view_content_link(self, obj):
-        return '<a href="/admin/mainapp/content/%d/?_to_field=id&_popup=1" target="_blank">%s</a>' % (int(obj.content.id), obj.content,)
+        return '<a href="/admin/mainapp/content/%d/?_to_field=id&_popup=1" target="_blank">%s</a>' % (
+            int(obj.content.id), obj.content,)
+
     view_content_link.allow_tags = True
-    view_content_link.short_description = 'Content edit link' # Optional
+    view_content_link.short_description = 'Content edit link'  # Optional
+
     class Media:
-        #from django.conf import settings
-        #media_url = getattr(settings, 'MEDIA_URL', '/media')
-        js = [ 'https://www.gstatic.com/charts/loader.js', '/static/admin/js/content_status_stats.js' ]
+        # from django.conf import settings
+        # media_url = getattr(settings, 'MEDIA_URL', '/media')
+        js = ['https://www.gstatic.com/charts/loader.js', '/static/admin/js/content_status_stats.js']
 
 
 @admin.register(Faq)

mainapp/codeblock.py

@@ -1,7 +1,5 @@
-import tempfile
 import os
-
-from pip._vendor.distlib.metadata import _get_name_and_version
+import tempfile
 
 from FreeItLessons import settings
 
@@ -55,8 +53,7 @@ def get_sections(self, hide_solutions=True):
             return cb, tb, mb
 
     def _hide_solutions(self, cb, tb, mb):
-        return '', '',  ''
-
+        return '', '', ''
 
 
 class CodeBlockRunner:
@@ -122,6 +119,7 @@ def get_results(self):
 
 if __name__ == '__main__':
     from subprocess import Popen, PIPE
+
     cmd = settings.PYTHON_EXEC + " test003.py"
     p = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE)
     out, err = p.communicate()
@@ -140,4 +138,3 @@ def get_results(self):
     #     else:
     #         print("ERROR: run_results -> {}".format(run_results))
     #
-

mainapp/menus.py

@@ -11,7 +11,6 @@
                                weight=20,
                                icon="report"))
 
-
 # Define children for the my account menu
 myaccount_children = (
     MenuItem("Edit Profile",
@@ -35,5 +34,3 @@
                                reverse("accounts.views.myaccount"),
                                weight=10,
                                children=myaccount_children))
-
-

mainapp/models.py

@@ -1,15 +1,16 @@
 import datetime
-import django
 
-from django.db import models
+import django
 from django.contrib.auth.models import User
+from django.db import models
 from django_enumfield import enum
 
 
 class AutoDateTimeField(models.DateTimeField):
     def pre_save(self, model_instance, add):
         return datetime.datetime.now()
 
+
 class Author(models.Model):
     name = models.CharField(max_length=64)
     surname = models.CharField(max_length=64)
@@ -21,8 +22,9 @@ class Author(models.Model):
     linkedin_link = models.CharField(max_length=256, null=True, blank=True)
     external_link = models.CharField(max_length=256, null=True, blank=True)
     is_public_mentor = models.BooleanField(default=False)
-    #created_at = models.DateField(default=django.utils.timezone.now)
-    #updated_at = AutoDateTimeField(default=django.utils.timezone.now)
+
+    # created_at = models.DateField(default=django.utils.timezone.now)
+    # updated_at = AutoDateTimeField(default=django.utils.timezone.now)
 
     def __str__(self):
         return "{} {}".format(self.name, self.surname)
@@ -48,8 +50,9 @@ class Content(models.Model):
     value = models.TextField(max_length=4000)
     additional_text = models.CharField(max_length=512)
     author = models.ForeignKey(Author, null=True, blank=True, on_delete=models.DO_NOTHING)
-    #created_at = models.DateField(default=django.utils.timezone.now)
-    #updated_at = AutoDateTimeField(default=django.utils.timezone.now)
+
+    # created_at = models.DateField(default=django.utils.timezone.now)
+    # updated_at = AutoDateTimeField(default=django.utils.timezone.now)
 
     def __str__(self):
         return self.additional_text
@@ -83,8 +86,9 @@ class Chapter(models.Model):
     level = enum.EnumField(ChapterLevelType)
     note = models.TextField(max_length=256)
     author = models.ForeignKey(Author, null=True, blank=True, on_delete=models.DO_NOTHING)
-    #created_at = models.DateField(default=django.utils.timezone.now)
-    #updated_at = AutoDateTimeField(default=django.utils.timezone.now)
+
+    # created_at = models.DateField(default=django.utils.timezone.now)
+    # updated_at = AutoDateTimeField(default=django.utils.timezone.now)
 
     def __str__(self):
         return self.name
@@ -107,8 +111,9 @@ class Module(models.Model):
     chapters = []
     contents_list = []
     icons_list = []
-    #created_at = models.DateField(default=django.utils.timezone.now)
-    #updated_at = AutoDateTimeField(default=django.utils.timezone.now)
+
+    # created_at = models.DateField(default=django.utils.timezone.now)
+    # updated_at = AutoDateTimeField(default=django.utils.timezone.now)
 
     def __str__(self):
         return self.title
@@ -141,7 +146,7 @@ class ContentStatusType():
 
     @staticmethod
     def exists(type_name):
-        return hasattr(ContentStatusType, str(type_name).upper()) 
+        return hasattr(ContentStatusType, str(type_name).upper())
 
 
 CONTENT_STATUS_TYPE_CHOICES = (
@@ -152,6 +157,7 @@ def exists(type_name):
     (ContentStatusType.DONE, 'Done'),
 )
 
+
 class ContentStatus(models.Model):
     user = models.ForeignKey(User, null=False, blank=False, on_delete=models.DO_NOTHING)
     content = models.ForeignKey(Content, null=False, blank=False, on_delete=models.DO_NOTHING)
@@ -166,10 +172,8 @@ def __str__(self):
 
     @staticmethod
     def get_opinions_by_user_id(user_id):
-        q = '''SELECT id, status, COUNT(status) AS status_count 
-               FROM mainapp_contentstatus
-               WHERE user_id=%s
-               GROUP BY status'''
+        q = "SELECT id, status, COUNT(status) AS status_count "\
+            "FROM mainapp_contentstatus WHERE user_id=%s GROUP BY status"
         return ContentStatus.objects.raw(q, [user_id])
 
 
@@ -200,10 +204,10 @@ class Task(models.Model):
     suggestion_5 = models.TextField(max_length=1024, null=True, blank=True)
     level = models.PositiveIntegerField(default=0, blank=False, null=False)
     points = models.PositiveIntegerField(default=5, blank=False, null=False)
-    #created_at: datetime
-    #created_by: relatet to User
-    #reviewd_at: datetime
-    #reviewd_by: relatet to User
+    # created_at: datetime
+    # created_by: relatet to User
+    # reviewd_at: datetime
+    # reviewd_by: relatet to User
     my_order = models.PositiveIntegerField(default=1, blank=False, null=False)
 
     class Meta(object):
@@ -260,5 +264,5 @@ def save_or_update(task_id, user_id, is_finished, hint_id, time_spent_seconds=1)
             ts.save()
 
     def __str__(self):
-        return 'TaskSolution(user_id: {}, task_id: {}, is_finished: {}, time_spent_seconds: {})'\
+        return 'TaskSolution(user_id: {}, task_id: {}, is_finished: {}, time_spent_seconds: {})' \
             .format(self.user_id, self.task_id, self.is_finished, self.time_spent_seconds)

mainapp/views.py

@@ -1,27 +1,23 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 import base64
 import hashlib
-import json
-import os
-import tempfile
+import time
 
 import django
-from django.core.files.storage import default_storage
-from django.contrib.auth.decorators import login_required
 from django.contrib.auth.mixins import LoginRequiredMixin
-
+from django.core.files.storage import default_storage
 from django.db.models.fields.files import FieldFile
+from django.http import HttpResponse, HttpResponseBadRequest
 from django.views.generic.base import View, TemplateView
-import time
 
 from FreeItLessons import settings
 from mainapp.models import User, Author, Module, Chapter, Content, \
     ContentStatusType, ContentStatus, Faq, Task, TaskSolution
-
-from django.http import HttpResponse, HttpResponseBadRequest
 from mainapp.utils import TaskCodeRun
 
+
 class FakeField(object):
     storage = default_storage
 
@@ -119,17 +115,17 @@ def get_context_data(self, **kwargs):
         tasks_data = Task.objects.order_by('my_order').select_related().filter(is_visible=True)
         tasks = []
         for task in tasks_data:
-                try:
-                    task_solution = TaskSolution.objects.get(task_id=task.id, user_id=self.request.user.id)
-                except TaskSolution.DoesNotExist:
-                    task_solution = None
-
-                tasks.append({
-                    'id': task.id,
-                    'points': task.points,
-                    'name': task.name,
-                    'task_solution': task_solution,
-                })
+            try:
+                task_solution = TaskSolution.objects.get(task_id=task.id, user_id=self.request.user.id)
+            except TaskSolution.DoesNotExist:
+                task_solution = None
+
+            tasks.append({
+                'id': task.id,
+                'points': task.points,
+                'name': task.name,
+                'task_solution': task_solution,
+            })
         return {'tasks': tasks}
 
 
@@ -149,7 +145,7 @@ def get_context_data(self, **kwargs):
         task_instance = Task.objects.order_by('my_order').filter(id=task_id).get()
         return {'task': task_instance,
                 'asserts': self._get_asserts_from_tests_code(task_instance.tests)
-        }
+                }
 
 
 class ContetUserStatusView(View):
@@ -197,11 +193,11 @@ def get(self, request):
                         obj.save()
                         # print("created")
 
-                        #obj, created = ContentStatus.objects.update_or_create(user=user_instance,
+                        # obj, created = ContentStatus.objects.update_or_create(user=user_instance,
                         #                                                      content=content_instance,
                         #                                                      status=str(status).lower())
-                        ## print('ContentStatus created: {}'.format(created))
-                        #cs.save()
+                        # print('ContentStatus created: {}'.format(created))
+                        # cs.save()
                 else:
                     # print('status NOT EXISTS')
                     return HttpResponseBadRequest('status NOT EXISTS')
@@ -420,7 +416,7 @@ def get(self, request):
                 # print('content - id {}, data: {}'.format(content_id, cs))
                 # print('status: {}'.format(cs.status))
                 return HttpResponse(cs.status)
-                #return HttpResponse('OK')
+                # return HttpResponse('OK')
             else:
                 # print('content NOT EXISTS')
                 return HttpResponseBadRequest('content NOT EXISTS')
@@ -434,9 +430,9 @@ class OpinionsView(TemplateView):
 
     def get_context_data(self, **kwargs):
         opinions = ContentStatus.get_opinions_by_user_id(self.request.user.id)
-        ## print("opinions: {}".format(opinions))
-        ## print("opinions.columns: {}".format(opinions.columns))
-        #for item in opinions:
+        # print("opinions: {}".format(opinions))
+        # print("opinions.columns: {}".format(opinions.columns))
+        # for item in opinions:
         #    # print("status: {}, status_count: {}".format(item.status, item.status_count))
         return {'opinions': opinions}
 
@@ -535,12 +531,11 @@ def _calc_summary(self, points_summary, max_points_summary):
             return 0
 
 
-
 class LearnerSupportView(TemplateView):
     template_name = 'mainapp/learner_support_list.html'
 
     def get_context_data(self, **kwargs):
-        #items = LearnerSupport.get_all_by_user_id(self.request.user.id)
+        # items = LearnerSupport.get_all_by_user_id(self.request.user.id)
         items = {}
         # print("items: {}".format(items))
         return {'items': items}
@@ -560,7 +555,7 @@ def get_context_data(self, **kwargs):
       user_id = kwargs['user_id']
       if User.objects.filter(id__iexact=user_id).exists():
           # print('user EXISTS')
-      
+
           # request.user.is_authenticated():
 
           content_id = kwargs['content_id']
@@ -608,4 +603,3 @@ def content_user_status(request):
   #    # print(kwargs)
   #    return {'test_results': 123}
 """
-