Merge branch 'master' of github.com:vijos/vj4

vj4/handler/judge.py

@@ -2,7 +2,6 @@
 import calendar
 import datetime
 import logging
-import time
 from bson import objectid
 
 from vj4 import app

vj4/handler/problem.py

@@ -1,7 +1,6 @@
 import asyncio
 import datetime
 import functools
-import hashlib
 import io
 import zipfile
 from bson import objectid
@@ -374,7 +373,7 @@ async def post_edit_reply(self, *, pid: document.convert_doc_id,
       self.check_perm(builtin.PERM_VIEW_PROBLEM_HIDDEN)
     psdoc, psrdoc = await problem.get_solution_reply(self.domain_id, psid, psrid)
     if not psdoc or psdoc['parent_doc_id'] != pdoc['doc_id']:
-      raise error.DocumentNotFoundError(domain_id, document.TYPE_PROBLEM_SOLUTION, psid)
+      raise error.DocumentNotFoundError(self.domain_id, document.TYPE_PROBLEM_SOLUTION, psid)
     if not self.own(psrdoc, builtin.PERM_EDIT_PROBLEM_SOLUTION_REPLY_SELF):
       self.check_perm(builtin.PERM_EDIT_PROBLEM_SOLUTION_REPLY)
     await problem.edit_solution_reply(self.domain_id, psid, psrid, content)
@@ -391,7 +390,7 @@ async def post_delete_reply(self, *, pid: document.convert_doc_id,
       self.check_perm(builtin.PERM_VIEW_PROBLEM_HIDDEN)
     psdoc, psrdoc = await problem.get_solution_reply(self.domain_id, psid, psrid)
     if not psdoc or psdoc['parent_doc_id'] != pdoc['doc_id']:
-      raise error.DocumentNotFoundError(domain_id, document.TYPE_PROBLEM_SOLUTION, psid)
+      raise error.DocumentNotFoundError(self.domain_id, document.TYPE_PROBLEM_SOLUTION, psid)
     if not self.own(psrdoc, builtin.PERM_DELETE_PROBLEM_SOLUTION_REPLY_SELF):
       self.check_perm(builtin.PERM_DELETE_PROBLEM_SOLUTION_REPLY)
     await oplog.add(self.user['_id'], oplog.TYPE_DELETE_SUB_DOCUMENT, sub_doc=psrdoc,
@@ -462,7 +461,7 @@ async def get(self, *, pid: document.convert_doc_id, psid: document.convert_doc_
       self.check_perm(builtin.PERM_VIEW_PROBLEM_HIDDEN)
     psdoc, psrdoc = await problem.get_solution_reply(self.domain_id, psid, psrid)
     if not psdoc or psdoc['parent_doc_id'] != pdoc['doc_id']:
-      raise error.DocumentNotFoundError(domain_id, document.TYPE_PROBLEM_SOLUTION, psid)
+      raise error.DocumentNotFoundError(self.domain_id, document.TYPE_PROBLEM_SOLUTION, psid)
     self.response.content_type = 'text/markdown'
     self.response.text = psrdoc['content']
 
@@ -570,7 +569,7 @@ async def post(self, *, pid: document.convert_doc_id, hidden: bool=False,
     category = self.split_tags(category)
     tag = self.split_tags(tag)
     for c in category:
-      if not (c in builtin.PROBLEM_CATEGORIES \
+      if not (c in builtin.PROBLEM_CATEGORIES
               or c in builtin.PROBLEM_SUB_CATEGORIES):
         raise error.ValidationError('category')
     if difficulty_setting not in problem.SETTING_DIFFICULTY_RANGE:

vj4/handler/training.py

@@ -1,5 +1,4 @@
 import asyncio
-import time
 from json import decoder
 from bson import objectid
 

vj4/model/adaptor/discussion.py

@@ -6,7 +6,6 @@
 
 from vj4 import error
 from vj4.model import document
-from vj4.model.adaptor import problem
 from vj4.service import smallcache
 from vj4.util import argmethod
 from vj4.util import validator

vj4/model/adaptor/training.py

@@ -1,11 +1,8 @@
-import asyncio
 from bson import objectid
 from pymongo import errors
 
-from vj4 import constant
 from vj4 import error
 from vj4.model import document
-from vj4.model.adaptor import problem
 from vj4.util import argmethod
 from vj4.util import validator
 

vj4/model/adaptor/userfile.py

@@ -1,8 +1,5 @@
-import asyncio
 from bson import objectid
-from pymongo import errors
 
-from vj4 import constant
 from vj4 import error
 from vj4.model import builtin
 from vj4.model import document

vj4/model/builtin.py

@@ -4,7 +4,6 @@
 import itertools
 
 from vj4 import constant
-from vj4 import error
 from vj4.util import version
 
 # Permissions.

vj4/model/oplog.py

@@ -1,6 +1,4 @@
-import itertools
 from bson import objectid
-from pymongo import ReturnDocument
 
 from vj4 import db
 from vj4.util import argmethod

vj4/service/staticmanifest.py

@@ -1,5 +1,3 @@
-import time
-
 from os import path
 from vj4.util import json
 
@@ -18,7 +16,7 @@ def init(static_dir):
     with open(_manifest_path, 'r') as manifest_file:
       data = json.decode(manifest_file.read())
     _manifest = data
-  except Exception as e:
+  except Exception:
     pass
 
 

vj4/template.py

@@ -15,7 +15,6 @@
 from vj4.service import staticmanifest
 from vj4.util import json
 from vj4.util import options
-from vj4.util import version
 
 
 class Undefined(jinja2.runtime.Undefined):

vj4/util/validator.py

@@ -2,7 +2,6 @@
 
 from vj4 import constant
 from vj4 import error
-from vj4.model import builtin
 
 
 def is_uid(s):