From 6f2e29a067cbeaf88b8ea478bb7c24fe8772180a Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Mon, 20 Nov 2017 16:07:43 +0530
Subject: Multiple Changes: - Add python-decouple package to requirements - use
 sane defaults and python-decouple in yaksh.settings and online_test.settings
 module - Replace hardcoded localhost domain name referring to code server
 with dynamic - Move Dockerfile to dedicated directory - Add dynamic
 run-as-admin commands to the base command depending on OS - Replace linux
 specific commands like cp with Python functions

---
 yaksh/settings.py | 2 +-
 yaksh/views.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'yaksh')

diff --git a/yaksh/settings.py b/yaksh/settings.py
index e414e75..d895d19 100644
--- a/yaksh/settings.py
+++ b/yaksh/settings.py
@@ -10,7 +10,7 @@ N_CODE_SERVERS = config('N_CODE_SERVERS', default=5, cast=int)
 # The server pool port.  This is the server which returns available server
 # ports so as to minimize load.  This is some random number where no other
 # service is running.  It should be > 1024 and less < 65535 though.
-SERVER_POOL_PORT = config('EMAIL_PORT', default=55555, cast=int)
+SERVER_POOL_PORT = config('SERVER_POOL_PORT', default=55555, cast=int)
 
 SERVER_HOST_NAME = config('SERVER_HOST_NAME', default='http://localhost')
 #'localhost'
diff --git a/yaksh/views.py b/yaksh/views.py
index a001ffd..8fe4523 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -35,7 +35,7 @@ except ImportError:
     from io import BytesIO as string_io
 import re
 # Local imports.
-from yaksh.code_server import get_result as get_result_from_code_server,
+from yaksh.code_server import get_result as get_result_from_code_server
 from yaksh.models import (
     Answer, AnswerPaper, AssignmentUpload, Course, FileUpload, FloatTestCase,
     HookTestCase, IntegerTestCase, McqTestCase, Profile,
-- 
cgit