flake8

.flake8

@@ -0,0 +1,7 @@
+[flake8]
+exclude = 
+  xss_filter.py,
+  migrations/,
+  *settings.py
+max-line-length = 180
+inline-quotes = "

.travis.yml

@@ -9,4 +9,5 @@ install:
     - python manage.py migrate
     - python manage.py initadmin
 script:
+    - flake8 .
     - python manage.py test

account/decorators.py

@@ -1,7 +1,6 @@
 from __future__ import unicode_literals
 import functools
 
-from django.http import HttpResponse
 from django.utils.translation import ugettext as _
 
 from utils.api import JSONResponse

account/middleware.py

@@ -23,4 +23,4 @@ class AdminRequiredMiddleware(object):
         path = request.path_info
         if path.startswith("/admin/") or path.startswith("/api/admin/"):
             if not(request.user.is_authenticated() and request.user.is_admin()):
-                return JSONResponse.response({"error": "login-required", "data": _("Please login in first")})
+                return JSONResponse.response({"error": "login-required", "data": _("Please login in first")})

account/urls/admin.py

@@ -3,5 +3,5 @@ from django.conf.urls import url
 from ..views.admin import UserAdminAPI
 
 urlpatterns = [
-    url(r'^user$', UserAdminAPI.as_view(), name="user_admin_api"),
+    url(r"^user$", UserAdminAPI.as_view(), name="user_admin_api"),
 ]

account/urls/oj.py

@@ -3,7 +3,7 @@ from django.conf.urls import url
 from ..views.oj import UserLoginAPI, UserRegisterAPI, UserChangePasswordAPI
 
 urlpatterns = [
-    url(r'^login$', UserLoginAPI.as_view(), name="user_login_api"),
+    url(r"^login$", UserLoginAPI.as_view(), name="user_login_api"),
-    url(r'^register$', UserRegisterAPI.as_view(), name="user_register_api"),
+    url(r"^register$", UserRegisterAPI.as_view(), name="user_register_api"),
-    url(r'^change_password$', UserChangePasswordAPI.as_view(), name="user_change_password_api")
+    url(r"^change_password$", UserChangePasswordAPI.as_view(), name="user_change_password_api")
 ]

announcement/tests.py

@@ -32,6 +32,6 @@ class AnnouncementAdminTest(APITestCase):
 
     def test_delete_announcemen(self):
         id = self.test_create_announcement().data["data"]["id"]
-        resp = self.client.delete(self.url, data={'id': id})
+        resp = self.client.delete(self.url, data={"id": id})
         self.assertSuccess(resp)
         self.assertFalse(Announcement.objects.filter(id=id).exists())

announcement/urls/admin.py

@@ -3,5 +3,5 @@ from django.conf.urls import url
 from ..views import AnnouncementAdminAPI
 
 urlpatterns = [
-    url(r'^announcement$', AnnouncementAdminAPI.as_view(), name="announcement_admin_api"),
+    url(r"^announcement$", AnnouncementAdminAPI.as_view(), name="announcement_admin_api"),
 ]

conf/serializers.py

@@ -13,17 +13,17 @@ class EditSMTPConfigSerializer(serializers.Serializer):
 
 class CreateSMTPConfigSerializer(EditSMTPConfigSerializer):
     password = serializers.CharField(max_length=128)
-    
+
 
 class SMTPConfigSerializer(serializers.ModelSerializer):
     class Meta:
         model = SMTPConfig
         exclude = ["id", "password"]
-        
+
 
 class TestSMTPConfigSerializer(serializers.Serializer):
     email = serializers.EmailField()
-    
+
 
 class CreateEditWebsiteConfigSerializer(serializers.Serializer):
     base_url = serializers.CharField(max_length=128)
@@ -56,4 +56,3 @@ class JudgeServerHeartbeatSerializer(serializers.Serializer):
     cpu = serializers.FloatField(min_value=0, max_value=100)
     action = serializers.ChoiceField(choices=("heartbeat", ))
     service_url = serializers.CharField(max_length=128, required=False)
-

conf/tests.py

@@ -51,7 +51,7 @@ class SMTPConfigTest(APITestCase):
 
 class WebsiteConfigAPITest(APITestCase):
     def test_create_website_config(self):
-        user = self.create_super_admin()
+        self.create_super_admin()
         url = self.reverse("website_config_api")
         data = {"base_url": "http://test.com", "name": "test name",
                 "name_shortcut": "test oj", "footer": "<a>test</a>",
@@ -60,7 +60,7 @@ class WebsiteConfigAPITest(APITestCase):
         self.assertSuccess(resp)
 
     def test_edit_website_config(self):
-        user = self.create_super_admin()
+        self.create_super_admin()
         url = self.reverse("website_config_api")
         data = {"base_url": "http://test.com", "name": "test name",
                 "name_shortcut": "test oj", "footer": "<a>test</a>",
@@ -103,7 +103,7 @@ class JudgeServerHeartbeatest(APITestCase):
         self.assertSuccess(resp)
         server = JudgeServer.objects.first()
         self.assertEqual(server.ip, "127.0.0.1")
-        self.assertEqual(server.service_url ,None)
+        self.assertEqual(server.service_url, None)
 
     def test_new_heartbeat_service_url(self):
         service_url = "http://1.2.3.4:8000/api/judge"

conf/urls/admin.py

@@ -3,7 +3,7 @@ from django.conf.urls import url
 from ..views import WebsiteConfigAPI, SMTPAPI, JudgeServerAPI
 
 urlpatterns = [
-    url(r'^smtp$', SMTPAPI.as_view(), name="smtp_admin_api"),
+    url(r"^smtp$", SMTPAPI.as_view(), name="smtp_admin_api"),
-    url(r'^website$', WebsiteConfigAPI.as_view(), name="website_config_api"),
+    url(r"^website$", WebsiteConfigAPI.as_view(), name="website_config_api"),
-    url(r'^judge_server', JudgeServerAPI.as_view(), name="judge_server_api")
+    url(r"^judge_server", JudgeServerAPI.as_view(), name="judge_server_api")
 ]

conf/urls/oj.py

@@ -4,6 +4,6 @@ from ..views import WebsiteConfigAPI, JudgeServerHeartbeatAPI
 
 
 urlpatterns = [
-    url(r'^website$', WebsiteConfigAPI.as_view(), name="website_info_api"),
+    url(r"^website$", WebsiteConfigAPI.as_view(), name="website_info_api"),
-    url(r'^judge_server_heartbeat$', JudgeServerHeartbeatAPI.as_view(), name="judge_server_heartbeat_api")
+    url(r"^judge_server_heartbeat$", JudgeServerHeartbeatAPI.as_view(), name="judge_server_heartbeat_api")
 ]

conf/views.py

@@ -49,8 +49,6 @@ class SMTPTestAPI(APIView):
     @super_admin_required
     @validate_serializer(TestSMTPConfigSerializer)
     def post(self, request):
-        email = request.data["email"]
-        # todo: test send email
         return self.success({"result": True})
 
 
@@ -111,7 +109,7 @@ class JudgeServerHeartbeatAPI(CSRFExemptAPIView):
             server.cpu_core = data["cpu_core"]
             server.memory_usage = data["memory"]
             server.cpu_usage = data["cpu"]
-            server.service_url= service_url
+            server.service_url = service_url
             server.ip = ip
             server.last_heartbeat = timezone.now()
             server.save()
@@ -126,7 +124,3 @@ class JudgeServerHeartbeatAPI(CSRFExemptAPIView):
                                        last_heartbeat=timezone.now(),
                                        )
         return self.success()
-
-
-
-

contest/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

contest/models.py

@@ -103,4 +103,4 @@ class OIContestRank(ContestRank):
     submission_info = JSONField(default={})
 
     class Meta:
-        db_table = "oi_contenst_rank"
+        db_table = "oi_contenst_rank"

contest/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

contest/views.py

@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.

deploy/requirements.txt

@@ -3,3 +3,4 @@ djangorestframework==3.3.3
 pillow
 jsonfield
 otpauth
+flake8-quotes

group/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

group/apps.py

@@ -1,7 +0,0 @@
-from __future__ import unicode_literals
-
-from django.apps import AppConfig
-
-
-class GroupConfig(AppConfig):
-    name = 'group'

group/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

group/views.py

@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.

oj/__init__.py

@@ -1,9 +0,0 @@
-"""
-   ___         _  _                  __              _                _                         _
-  /___\ _ __  | |(_) _ __    ___     \ \  _   _   __| |  __ _   ___  | |__   _   _    __ _   __| | _   _
- //  //| '_ \ | || || '_ \  / _ \     \ \| | | | / _` | / _` | / _ \ | '_ \ | | | |  / _` | / _` || | | |
-/ \_// | | | || || || | | ||  __/  /\_/ /| |_| || (_| || (_| ||  __/ | |_) || |_| | | (_| || (_| || |_| |
-\___/  |_| |_||_||_||_| |_| \___|  \___/  \__,_| \__,_| \__, | \___| |_.__/  \__, |  \__, | \__,_| \__,_|
-                                                        |___/                |___/      |_|
-https://github.com/QingdaoU/OnlineJudge
-"""

oj/custom_settings.example.py

@@ -2,5 +2,3 @@
 
 # please set your own SECRET_KEY to a long random string
 # SECRET_KEY = ""
-
-

oj/db_router.py

@@ -3,13 +3,13 @@
 
 class DBRouter(object):
     def db_for_read(self, model, **hints):
-        if model._meta.app_label == 'submission':
+        if model._meta.app_label == "submission":
-            return 'submission'
+            return "submission"
         return "default"
 
     def db_for_write(self, model, **hints):
-        if model._meta.app_label == 'submission':
+        if model._meta.app_label == "submission":
-            return 'submission'
+            return "submission"
         return "default"
 
     def allow_relation(self, obj1, obj2, **hints):

oj/urls.py

@@ -2,9 +2,9 @@
 from django.conf.urls import include, url
 
 urlpatterns = [
-    url(r'^api/', include("account.urls.oj")),
+    url(r"^api/", include("account.urls.oj")),
-    url(r'^api/admin/', include("account.urls.admin")),
+    url(r"^api/admin/", include("account.urls.admin")),
-    url(r'^api/admin/', include("announcement.urls.admin")),
+    url(r"^api/admin/", include("announcement.urls.admin")),
-    url(r'^api/', include("conf.urls.oj")),
+    url(r"^api/", include("conf.urls.oj")),
-    url(r'^api/admin/', include("conf.urls.admin"))
+    url(r"^api/admin/", include("conf.urls.admin"))
 ]

problem/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

problem/models.py

@@ -1,4 +1,3 @@
-# coding=utf-8
 from __future__ import unicode_literals
 
 from jsonfield import JSONField

problem/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

problem/views.py

@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.

utils/api/__init__.py

@@ -1,2 +1,2 @@
-from .api import *
+from .api import *  # NOQA
-from ._serializers import *
+from ._serializers import *  # NOQA

utils/api/_serializers.py

@@ -18,4 +18,4 @@ class DateTimeTZField(serializers.DateTimeField):
 
 
 class IDOnlySerializer(serializers.Serializer):
-    id = serializers.IntegerField()
+    id = serializers.IntegerField()

utils/api/tests.py

@@ -30,4 +30,4 @@ class APITestCase(TestCase):
         self.assertTrue(response.data["error"] is None)
 
     def assertFailed(self, response):
-        self.assertTrue(response.data["error"] is not None)
+        self.assertTrue(response.data["error"] is not None)

utils/captcha/__init__.py

@@ -1,5 +1,3 @@
-# coding:utf-8
-
 """
 Copyright 2013 TY<tianyu0915@gmail.com>
 
@@ -20,6 +18,7 @@ import os
 import time
 import random
 
+from io import StringIO
 from django.http import HttpResponse
 from PIL import Image, ImageDraw, ImageFont
 
@@ -27,19 +26,19 @@ from PIL import Image, ImageDraw, ImageFont
 class Captcha(object):
 
     def __init__(self, request):
-        """   
+        """
         初始化,设置各种属性
         """
         self.django_request = request
-        self.session_key = '_django_captcha_key'
+        self.session_key = "_django_captcha_key"
-        self.captcha_expires_time = '_django_captcha_expires_time'
+        self.captcha_expires_time = "_django_captcha_expires_time"
 
         # 验证码图片尺寸
         self.img_width = 90
         self.img_height = 30
 
     def _get_font_size(self, code):
-        """  
+        """
         将图片高度的80%作为字体大小
         """
         s1 = int(self.img_height * 0.8)
@@ -47,7 +46,7 @@ class Captcha(object):
         return int(min((s1, s2)) + max((s1, s2)) * 0.05)
 
     def _set_answer(self, answer):
-        """  
+        """
         设置答案和过期时间
         """
         self.django_request.session[self.session_key] = str(answer)
@@ -57,7 +56,7 @@ class Captcha(object):
         """
         生成随机数或随机字符串
         """
-        string = random.sample('abcdefghkmnpqrstuvwxyzABCDEFGHGKMNOPQRSTUVWXYZ23456789', 4)
+        string = random.sample("abcdefghkmnpqrstuvwxyzABCDEFGHGKMNOPQRSTUVWXYZ23456789", 4)
         self._set_answer("".join(string))
         return string
 
@@ -68,9 +67,9 @@ class Captcha(object):
         background = (random.randrange(200, 255), random.randrange(200, 255), random.randrange(200, 255))
         code_color = (random.randrange(0, 50), random.randrange(0, 50), random.randrange(0, 50), 255)
 
-        font_path = os.path.join(os.path.normpath(os.path.dirname(__file__)), 'timesbi.ttf')
+        font_path = os.path.join(os.path.normpath(os.path.dirname(__file__)), "timesbi.ttf")
 
-        image = Image.new('RGB', (self.img_width, self.img_height), background)
+        image = Image.new("RGB", (self.img_width, self.img_height), background)
         code = self._make_code()
         font_size = self._get_font_size(code)
         draw = ImageDraw.Draw(image)
@@ -82,22 +81,22 @@ class Captcha(object):
             # 字符y坐标
             y = random.randrange(1, 7)
             # 随机字符大小
-            font = ImageFont.truetype(font_path.replace('\\', '/'), font_size + random.randrange(-3, 7))
+            font = ImageFont.truetype(font_path.replace("\\", "/"), font_size + random.randrange(-3, 7))
             draw.text((x, y), i, font=font, fill=code_color)
             # 随机化字符之间的距离 字符粘连可以降低识别率
             x += font_size * random.randrange(6, 8) / 10
 
-        buf = StringIO.StringIO()
+        buf = StringIO()
-        image.save(buf, 'gif')
+        image.save(buf, "gif")
 
         self.django_request.session[self.session_key] = "".join(code)
-        return HttpResponse(buf.getvalue(), 'image/gif')
+        return HttpResponse(buf.getvalue(), "image/gif")
 
     def check(self, code):
         """
         检查用户输入的验证码是否正确
         """
-        _code = self.django_request.session.get(self.session_key) or ''
+        _code = self.django_request.session.get(self.session_key) or ""
         if not _code:
             return False
         expires_time = self.django_request.session.get(self.captcha_expires_time) or 0

utils/models.py

@@ -1,5 +1,3 @@
-# coding=utf-8
-import json
 from django.db import models
 
 from utils.xss_filter import XssHtml
@@ -15,7 +13,3 @@ class RichTextField(models.TextField):
         parser.feed(value)
         parser.close()
         return parser.getHtml()
-
-
-class JsonField(models.TextField):
-    pass