Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix datetime name conflict

Browse Source
This commit is contained in:
kimth
2012-08-24 08:23:46 -04:00
parent 95a7a5b08b
commit fdecaef7ef
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/lib/xmodule/xmodule/capa_module.py
View File

@@ -7,7 +7,7 @@ import traceback
import re
import sys
from datetime import datetime, timedelta
from datetime import timedelta
from django.conf import settings
from lxml import etree
from pkg_resources import resource_string
@@ -465,10 +465,11 @@ class CapaModule(XModule):
# Problem queued. Students must wait XQUEUE_WAITTIME_BETWEEN_REQUESTS
if self.lcp.is_queued():
current_time = datetime.now()
current_time = datetime.datetime.now()
prev_submit_time = self.lcp.get_recentmost_queuetime()
if (current_time-prev_submit_time).total_seconds() < settings.XQUEUE_WAITTIME_BETWEEN_REQUESTS:
msg = 'You must wait %d seconds between queueing requests' % settings.XQUEUE_WAITTIME_BETWEEN_REQUESTS
waittime_between_requests = settings.XQUEUE_WAITTIME_BETWEEN_REQUESTS
if (current_time-prev_submit_time).total_seconds() < waittime_between_requests:
msg = 'You must wait at least %d seconds between queue submissions' % waittime_between_requests
return {'success': msg, 'html': ''}
try: