diff --git a/judge/client.py b/judge/client.py
index faab51ab..53ba4661 100644
--- a/judge/client.py
+++ b/judge/client.py
@@ -40,7 +40,7 @@ class JudgeClient(object):
# 如果实际使用超过了3倍, 就只能得到Runtime Error的结果了
# 而最后会比较Java实际使用的内存和1.5倍的设定内存的大小
self._real_max_memory = max_memory
- if self._language["name"] == "java":
+ if self._language["name"] == "java" or self._language["name"] == "python":
self._max_memory = judger.MEMORY_UNLIMITED
self.execute_command = self._language["execute_command"].\
format(exe_path=self._exe_path, max_memory=max_memory * 3).split(" ")
diff --git a/judge/language.py b/judge/language.py
index 63f0519a..cdc7bb96 100644
--- a/judge/language.py
+++ b/judge/language.py
@@ -36,6 +36,16 @@ languages = {
"-XX:PermSize=8M -Xms16M -Xmx{max_memory} -Djava.security.manager "
"-Djava.security.policy==policy -Djava.awt.headless=true Main",
"use_sandbox": False
+ },
+ 4: {
+ "name": "python",
+ "src_name": "main.py",
+ "code": 4,
+ "compile_max_cpu_time": 3000,
+ "compile_max_memory": 1024 * 1024 * 1024,
+ "compile_command": "/usr/bin/python -m py_compile {src_path}",
+ "execute_command": "/usr/bin/python {exe_path}/main.pyc",
+ "use_sandbox": False
}
}
diff --git a/static/src/js/app/oj/problem/problem.js b/static/src/js/app/oj/problem/problem.js
index f071768b..d3846599 100644
--- a/static/src/js/app/oj/problem/problem.js
+++ b/static/src/js/app/oj/problem/problem.js
@@ -37,7 +37,7 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert", "ZeroClipboard"],
var userId;
function setLanguage(language){
- var languageTypes = {"1": "text/x-csrc", "2": "text/x-c++src", "3": "text/x-java"};
+ var languageTypes = {"1": "text/x-csrc", "2": "text/x-c++src", "3": "text/x-java","4": "text/x-python"};
codeEditor.setOption("mode", languageTypes[language]);
}
@@ -144,6 +144,10 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert", "ZeroClipboard"],
if (code.indexOf("public class Main") > -1||code.indexOf("System.out.print") > -1) {
return "3";
}
+ //python
+ if (code.indexOf("input") > -1 && code.indexOf("print") > -1) {
+ return "4";
+ }
}
function getServerTime(){
diff --git a/static/src/js/build.js b/static/src/js/build.js
index 1bd9953b..7bb94fe1 100644
--- a/static/src/js/build.js
+++ b/static/src/js/build.js
@@ -40,6 +40,7 @@
//code mirror 代码编辑器 ->codeMirror
_codeMirror: "lib/codeMirror/codemirror",
codeMirrorClang: "lib/codeMirror/language/clike",
+ codeMirrorPython: "lib/codeMirror/language/python",
// bootstrap组件
modal: "lib/bootstrap/modal",
diff --git a/static/src/js/config.js b/static/src/js/config.js
index 6318b242..7d21a791 100644
--- a/static/src/js/config.js
+++ b/static/src/js/config.js
@@ -42,6 +42,7 @@ var require = {
//code mirror 代码编辑器 ->codeMirror
_codeMirror: "lib/codeMirror/codemirror",
codeMirrorClang: "lib/codeMirror/language/clike",
+ codeMirrorPython: "lib/codeMirror/language/python",
// bootstrap组件
modal: "lib/bootstrap/modal",
diff --git a/static/src/js/lib/codeMirror/language/python.js b/static/src/js/lib/codeMirror/language/python.js
new file mode 100644
index 00000000..d3cbacf8
--- /dev/null
+++ b/static/src/js/lib/codeMirror/language/python.js
@@ -0,0 +1,340 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+ if (typeof exports == "object" && typeof module == "object") // CommonJS
+ mod(require("../../lib/codemirror"));
+ else if (typeof define == "function" && define.amd) // AMD
+ define(["_codeMirror"], mod);
+ else // Plain browser env
+ mod(CodeMirror);
+})(function(CodeMirror) {
+ "use strict";
+
+ function wordRegexp(words) {
+ return new RegExp("^((" + words.join(")|(") + "))\\b");
+ }
+
+ var wordOperators = wordRegexp(["and", "or", "not", "is"]);
+ var commonKeywords = ["as", "assert", "break", "class", "continue",
+ "def", "del", "elif", "else", "except", "finally",
+ "for", "from", "global", "if", "import",
+ "lambda", "pass", "raise", "return",
+ "try", "while", "with", "yield", "in"];
+ var commonBuiltins = ["abs", "all", "any", "bin", "bool", "bytearray", "callable", "chr",
+ "classmethod", "compile", "complex", "delattr", "dict", "dir", "divmod",
+ "enumerate", "eval", "filter", "float", "format", "frozenset",
+ "getattr", "globals", "hasattr", "hash", "help", "hex", "id",
+ "input", "int", "isinstance", "issubclass", "iter", "len",
+ "list", "locals", "map", "max", "memoryview", "min", "next",
+ "object", "oct", "open", "ord", "pow", "property", "range",
+ "repr", "reversed", "round", "set", "setattr", "slice",
+ "sorted", "staticmethod", "str", "sum", "super", "tuple",
+ "type", "vars", "zip", "__import__", "NotImplemented",
+ "Ellipsis", "__debug__"];
+ CodeMirror.registerHelper("hintWords", "python", commonKeywords.concat(commonBuiltins));
+
+ function top(state) {
+ return state.scopes[state.scopes.length - 1];
+ }
+
+ CodeMirror.defineMode("python", function(conf, parserConf) {
+ var ERRORCLASS = "error";
+
+ var singleDelimiters = parserConf.singleDelimiters || /^[\(\)\[\]\{\}@,:`=;\.]/;
+ var doubleOperators = parserConf.doubleOperators || /^([!<>]==|<>|<<|>>|\/\/|\*\*)/;
+ var doubleDelimiters = parserConf.doubleDelimiters || /^(\+=|\-=|\*=|%=|\/=|&=|\|=|\^=)/;
+ var tripleDelimiters = parserConf.tripleDelimiters || /^(\/\/=|>>=|<<=|\*\*=)/;
+
+ var hangingIndent = parserConf.hangingIndent || conf.indentUnit;
+
+ var myKeywords = commonKeywords, myBuiltins = commonBuiltins;
+ if (parserConf.extra_keywords != undefined)
+ myKeywords = myKeywords.concat(parserConf.extra_keywords);
+
+ if (parserConf.extra_builtins != undefined)
+ myBuiltins = myBuiltins.concat(parserConf.extra_builtins);
+
+ var py3 = parserConf.version && parseInt(parserConf.version, 10) == 3
+ if (py3) {
+ // since http://legacy.python.org/dev/peps/pep-0465/ @ is also an operator
+ var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!@]/;
+ var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*/;
+ myKeywords = myKeywords.concat(["nonlocal", "False", "True", "None", "async", "await"]);
+ myBuiltins = myBuiltins.concat(["ascii", "bytes", "exec", "print"]);
+ var stringPrefixes = new RegExp("^(([rbuf]|(br))?('{3}|\"{3}|['\"]))", "i");
+ } else {
+ var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!]/;
+ var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*/;
+ myKeywords = myKeywords.concat(["exec", "print"]);
+ myBuiltins = myBuiltins.concat(["apply", "basestring", "buffer", "cmp", "coerce", "execfile",
+ "file", "intern", "long", "raw_input", "reduce", "reload",
+ "unichr", "unicode", "xrange", "False", "True", "None"]);
+ var stringPrefixes = new RegExp("^(([rub]|(ur)|(br))?('{3}|\"{3}|['\"]))", "i");
+ }
+ var keywords = wordRegexp(myKeywords);
+ var builtins = wordRegexp(myBuiltins);
+
+ // tokenizers
+ function tokenBase(stream, state) {
+ if (stream.sol()) state.indent = stream.indentation()
+ // Handle scope changes
+ if (stream.sol() && top(state).type == "py") {
+ var scopeOffset = top(state).offset;
+ if (stream.eatSpace()) {
+ var lineOffset = stream.indentation();
+ if (lineOffset > scopeOffset)
+ pushPyScope(state);
+ else if (lineOffset < scopeOffset && dedent(stream, state))
+ state.errorToken = true;
+ return null;
+ } else {
+ var style = tokenBaseInner(stream, state);
+ if (scopeOffset > 0 && dedent(stream, state))
+ style += " " + ERRORCLASS;
+ return style;
+ }
+ }
+ return tokenBaseInner(stream, state);
+ }
+
+ function tokenBaseInner(stream, state) {
+ if (stream.eatSpace()) return null;
+
+ var ch = stream.peek();
+
+ // Handle Comments
+ if (ch == "#") {
+ stream.skipToEnd();
+ return "comment";
+ }
+
+ // Handle Number Literals
+ if (stream.match(/^[0-9\.]/, false)) {
+ var floatLiteral = false;
+ // Floats
+ if (stream.match(/^\d*\.\d+(e[\+\-]?\d+)?/i)) { floatLiteral = true; }
+ if (stream.match(/^\d+\.\d*/)) { floatLiteral = true; }
+ if (stream.match(/^\.\d+/)) { floatLiteral = true; }
+ if (floatLiteral) {
+ // Float literals may be "imaginary"
+ stream.eat(/J/i);
+ return "number";
+ }
+ // Integers
+ var intLiteral = false;
+ // Hex
+ if (stream.match(/^0x[0-9a-f]+/i)) intLiteral = true;
+ // Binary
+ if (stream.match(/^0b[01]+/i)) intLiteral = true;
+ // Octal
+ if (stream.match(/^0o[0-7]+/i)) intLiteral = true;
+ // Decimal
+ if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) {
+ // Decimal literals may be "imaginary"
+ stream.eat(/J/i);
+ // TODO - Can you have imaginary longs?
+ intLiteral = true;
+ }
+ // Zero by itself with no other piece of number.
+ if (stream.match(/^0(?![\dx])/i)) intLiteral = true;
+ if (intLiteral) {
+ // Integer literals may be "long"
+ stream.eat(/L/i);
+ return "number";
+ }
+ }
+
+ // Handle Strings
+ if (stream.match(stringPrefixes)) {
+ state.tokenize = tokenStringFactory(stream.current());
+ return state.tokenize(stream, state);
+ }
+
+ // Handle operators and Delimiters
+ if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters))
+ return "punctuation";
+
+ if (stream.match(doubleOperators) || stream.match(singleOperators))
+ return "operator";
+
+ if (stream.match(singleDelimiters))
+ return "punctuation";
+
+ if (state.lastToken == "." && stream.match(identifiers))
+ return "property";
+
+ if (stream.match(keywords) || stream.match(wordOperators))
+ return "keyword";
+
+ if (stream.match(builtins))
+ return "builtin";
+
+ if (stream.match(/^(self|cls)\b/))
+ return "variable-2";
+
+ if (stream.match(identifiers)) {
+ if (state.lastToken == "def" || state.lastToken == "class")
+ return "def";
+ return "variable";
+ }
+
+ // Handle non-detected items
+ stream.next();
+ return ERRORCLASS;
+ }
+
+ function tokenStringFactory(delimiter) {
+ while ("rub".indexOf(delimiter.charAt(0).toLowerCase()) >= 0)
+ delimiter = delimiter.substr(1);
+
+ var singleline = delimiter.length == 1;
+ var OUTCLASS = "string";
+
+ function tokenString(stream, state) {
+ while (!stream.eol()) {
+ stream.eatWhile(/[^'"\\]/);
+ if (stream.eat("\\")) {
+ stream.next();
+ if (singleline && stream.eol())
+ return OUTCLASS;
+ } else if (stream.match(delimiter)) {
+ state.tokenize = tokenBase;
+ return OUTCLASS;
+ } else {
+ stream.eat(/['"]/);
+ }
+ }
+ if (singleline) {
+ if (parserConf.singleLineStringErrors)
+ return ERRORCLASS;
+ else
+ state.tokenize = tokenBase;
+ }
+ return OUTCLASS;
+ }
+ tokenString.isString = true;
+ return tokenString;
+ }
+
+ function pushPyScope(state) {
+ while (top(state).type != "py") state.scopes.pop()
+ state.scopes.push({offset: top(state).offset + conf.indentUnit,
+ type: "py",
+ align: null})
+ }
+
+ function pushBracketScope(stream, state, type) {
+ var align = stream.match(/^([\s\[\{\(]|#.*)*$/, false) ? null : stream.column() + 1
+ state.scopes.push({offset: state.indent + hangingIndent,
+ type: type,
+ align: align})
+ }
+
+ function dedent(stream, state) {
+ var indented = stream.indentation();
+ while (top(state).offset > indented) {
+ if (top(state).type != "py") return true;
+ state.scopes.pop();
+ }
+ return top(state).offset != indented;
+ }
+
+ function tokenLexer(stream, state) {
+ if (stream.sol()) state.beginningOfLine = true;
+
+ var style = state.tokenize(stream, state);
+ var current = stream.current();
+
+ // Handle decorators
+ if (state.beginningOfLine && current == "@")
+ return stream.match(identifiers, false) ? "meta" : py3 ? "operator" : ERRORCLASS;
+
+ if (/\S/.test(current)) state.beginningOfLine = false;
+
+ if ((style == "variable" || style == "builtin")
+ && state.lastToken == "meta")
+ style = "meta";
+
+ // Handle scope changes.
+ if (current == "pass" || current == "return")
+ state.dedent += 1;
+
+ if (current == "lambda") state.lambda = true;
+ if (current == ":" && !state.lambda && top(state).type == "py")
+ pushPyScope(state);
+
+ var delimiter_index = current.length == 1 ? "[({".indexOf(current) : -1;
+ if (delimiter_index != -1)
+ pushBracketScope(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
+
+ delimiter_index = "])}".indexOf(current);
+ if (delimiter_index != -1) {
+ if (top(state).type == current) state.indent = state.scopes.pop().offset - hangingIndent
+ else return ERRORCLASS;
+ }
+ if (state.dedent > 0 && stream.eol() && top(state).type == "py") {
+ if (state.scopes.length > 1) state.scopes.pop();
+ state.dedent -= 1;
+ }
+
+ return style;
+ }
+
+ var external = {
+ startState: function(basecolumn) {
+ return {
+ tokenize: tokenBase,
+ scopes: [{offset: basecolumn || 0, type: "py", align: null}],
+ indent: basecolumn || 0,
+ lastToken: null,
+ lambda: false,
+ dedent: 0
+ };
+ },
+
+ token: function(stream, state) {
+ var addErr = state.errorToken;
+ if (addErr) state.errorToken = false;
+ var style = tokenLexer(stream, state);
+
+ if (style && style != "comment")
+ state.lastToken = (style == "keyword" || style == "punctuation") ? stream.current() : style;
+ if (style == "punctuation") style = null;
+
+ if (stream.eol() && state.lambda)
+ state.lambda = false;
+ return addErr ? style + " " + ERRORCLASS : style;
+ },
+
+ indent: function(state, textAfter) {
+ if (state.tokenize != tokenBase)
+ return state.tokenize.isString ? CodeMirror.Pass : 0;
+
+ var scope = top(state), closing = scope.type == textAfter.charAt(0)
+ if (scope.align != null)
+ return scope.align - (closing ? 1 : 0)
+ else
+ return scope.offset - (closing ? hangingIndent : 0)
+ },
+
+ electricInput: /^\s*[\}\]\)]$/,
+ closeBrackets: {triples: "'\""},
+ lineComment: "#",
+ fold: "indent"
+ };
+ return external;
+ });
+
+ CodeMirror.defineMIME("text/x-python", "python");
+
+ var words = function(str) { return str.split(" "); };
+
+ CodeMirror.defineMIME("text/x-cython", {
+ name: "python",
+ extra_keywords: words("by cdef cimport cpdef ctypedef enum except"+
+ "extern gil include nogil property public"+
+ "readonly struct union DEF IF ELIF ELSE")
+ });
+
+});
diff --git a/static/src/js/utils/codeMirror.js b/static/src/js/utils/codeMirror.js
index ebe32884..7e3b7c29 100644
--- a/static/src/js/utils/codeMirror.js
+++ b/static/src/js/utils/codeMirror.js
@@ -1,4 +1,4 @@
-define("codeMirror", ["_codeMirror", "codeMirrorClang"], function(CodeMirror){
+define("codeMirror", ["_codeMirror", "codeMirrorClang","codeMirrorPython"], function(CodeMirror){
function codeMirror(selector, language){
return CodeMirror.fromTextArea(selector,
{
diff --git a/template/src/oj/contest/submissions_list.html b/template/src/oj/contest/submissions_list.html
index 0a90c7b7..f435af1a 100644
--- a/template/src/oj/contest/submissions_list.html
+++ b/template/src/oj/contest/submissions_list.html
@@ -42,6 +42,7 @@
C
C++
Java
+ Python
取消筛选
diff --git a/template/src/oj/problem/_submit_problem.html b/template/src/oj/problem/_submit_problem.html
index f21f45df..5b642eb8 100644
--- a/template/src/oj/problem/_submit_problem.html
+++ b/template/src/oj/problem/_submit_problem.html
@@ -10,6 +10,9 @@
+
diff --git a/template/src/oj/submission/my_submission.html b/template/src/oj/submission/my_submission.html
index 46e2b2fc..2c220eaf 100644
--- a/template/src/oj/submission/my_submission.html
+++ b/template/src/oj/submission/my_submission.html
@@ -114,15 +114,8 @@
{% block js_block %}