Include due date parsing in new versioned xmodule.

common/lib/xmodule/xmodule/combined_open_ended_modulev1.py

@@ -12,6 +12,7 @@ import sys
 from pkg_resources import resource_string
 
 from .capa_module import only_one, ComplexEncoder
+from timeinfo import TimeInfo
 from .editing_module import EditingDescriptor
 from .html_checker import check_html
 from progress import Progress
@@ -23,10 +24,6 @@ import self_assessment_module
 import open_ended_module
 from combined_open_ended_rubric import CombinedOpenEndedRubric, RubricParsingError
 from .stringify import stringify_children
-import dateutil
-import dateutil.parser
-import datetime
-from timeparse import parse_timedelta
 
 log = logging.getLogger("mitx.courseware")
 
@@ -166,26 +163,13 @@ class CombinedOpenEndedV1Module():
         self.accept_file_upload = self.metadata.get('accept_file_upload', ACCEPT_FILE_UPLOAD) in TRUE_DICT
 
         display_due_date_string = self.metadata.get('due', None)
-        if display_due_date_string is not None:
-            try:
-                self.display_due_date = dateutil.parser.parse(display_due_date_string)
-            except ValueError:
-                log.error("Could not parse due date {0} for location {1}".format(display_due_date_string, location))
-                raise
-        else:
-            self.display_due_date = None
-
         grace_period_string = self.metadata.get('graceperiod', None)
-        if grace_period_string is not None and self.display_due_date:
-            try:
-                self.grace_period = parse_timedelta(grace_period_string)
-                self.close_date = self.display_due_date + self.grace_period
-            except:
-                log.error("Error parsing the grace period {0} for location {1}".format(grace_period_string, location))
-                raise
-        else:
-            self.grace_period = None
-            self.close_date = self.display_due_date
+        try:
+            self.timeinfo = TimeInfo(display_due_date_string, grace_period_string)  
+        except:
+            log.error("Error parsing due date information in location {0}".format(location))
+            raise
+        self.display_due_date = self.timeinfo.display_due_date
 
         # Used for progress / grading.  Currently get credit just for
         # completion (doesn't matter if you self-assessed correct/incorrect).
@@ -203,7 +187,7 @@ class CombinedOpenEndedV1Module():
             'rubric': definition['rubric'],
             'display_name': self.display_name,
             'accept_file_upload': self.accept_file_upload,
-            'close_date' : self.close_date,
+            'close_date' : self.timeinfo.close_date,
             }
 
         self.task_xml = definition['task_xml']
@@ -722,4 +706,4 @@ class CombinedOpenEndedV1Descriptor(XmlDescriptor, EditingDescriptor):
         for child in ['task']:
             add_child(child)
 
-        return elt
+        return elt