From 98542f79ece0d1755a1a04b9041f995784227dff Mon Sep 17 00:00:00 2001
From: kimth <kimt@mit.edu>
Date: Mon, 27 Aug 2012 19:14:47 -0400
Subject: [PATCH] Define dateformat variable in xqueue_interface

---
 common/lib/capa/capa/capa_problem.py     | 7 +++++--
 common/lib/capa/capa/responsetypes.py    | 2 +-
 common/lib/capa/capa/xqueue_interface.py | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/common/lib/capa/capa/capa_problem.py b/common/lib/capa/capa/capa_problem.py
index d7bae1a36c..9dc7658884 100644
--- a/common/lib/capa/capa/capa_problem.py
+++ b/common/lib/capa/capa/capa_problem.py
@@ -34,6 +34,7 @@ from datetime import datetime
 import eia
 import inputtypes
 from util import contextualize_text, convert_files_to_filenames
+import xqueue_interface
 
 # to be replaced with auto-registering
 import responsetypes
@@ -215,8 +216,10 @@ class LoncapaProblem(object):
             return None
 
         # Get a list of timestamps of all queueing requests, then convert it to a DateTime object
-        queuetimes = [self.correct_map.get_queuetime_str(answer_id) for answer_id in self.correct_map if self.correct_map.is_queued(answer_id)]
-        queuetimes = [datetime.strptime(qt,'%Y%m%d%H%M%S') for qt in queuetimes]
+        queuetime_strs = [self.correct_map.get_queuetime_str(answer_id)
+                          for answer_id in self.correct_map 
+                          if self.correct_map.is_queued(answer_id)]
+        queuetimes = [datetime.strptime(qt_str, xqueue_interface.dateformat) for qt_str in queuetime_strs]
 
         return max(queuetimes)
 
diff --git a/common/lib/capa/capa/responsetypes.py b/common/lib/capa/capa/responsetypes.py
index c997cec30b..2ab5f3eafd 100644
--- a/common/lib/capa/capa/responsetypes.py
+++ b/common/lib/capa/capa/responsetypes.py
@@ -1150,7 +1150,7 @@ class CodeResponse(LoncapaResponse):
                                                     body=json.dumps(contents))
 
         # State associated with the queueing request
-        qtime = datetime.strftime(datetime.now(), '%Y%m%d%H%M%S')
+        qtime = datetime.strftime(datetime.now(), xqueue_interface.dateformat)
         queuestate = {'key': queuekey,
                       'time': qtime,
                      }
diff --git a/common/lib/capa/capa/xqueue_interface.py b/common/lib/capa/capa/xqueue_interface.py
index 2930eb682d..519f63cacd 100644
--- a/common/lib/capa/capa/xqueue_interface.py
+++ b/common/lib/capa/capa/xqueue_interface.py
@@ -9,7 +9,7 @@ import time
 
 
 log = logging.getLogger('mitx.' + __name__)
-
+dateformat = '%Y%m%d%H%M%S'
 
 def make_hashkey(seed=None):
     '''