Commit e47f8b17 by Don Mitchell

Coding consistency changes for code review.

parent b7cfbe0c
...@@ -990,7 +990,7 @@ class ContentStoreTest(ModuleStoreTestCase): ...@@ -990,7 +990,7 @@ class ContentStoreTest(ModuleStoreTestCase):
def test_metadata_inheritance(self): def test_metadata_inheritance(self):
module_store = modulestore('direct') module_store = modulestore('direct')
import_from_xml(module_store, 'common/test/data/', ['full'], verbose=True) import_from_xml(module_store, 'common/test/data/', ['full'])
course = module_store.get_item(Location(['i4x', 'edX', 'full', 'course', '6.002_Spring_2012', None])) course = module_store.get_item(Location(['i4x', 'edX', 'full', 'course', '6.002_Spring_2012', None]))
......
...@@ -18,6 +18,7 @@ import json ...@@ -18,6 +18,7 @@ import json
from xblock.core import Scope, List, String, Object, Boolean from xblock.core import Scope, List, String, Object, Boolean
from .fields import Date from .fields import Date
from django.utils.timezone import UTC from django.utils.timezone import UTC
from xmodule.util import date_utils
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
...@@ -743,15 +744,15 @@ class CourseDescriptor(CourseFields, SequenceDescriptor): ...@@ -743,15 +744,15 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
@property @property
def first_eligible_appointment_date_text(self): def first_eligible_appointment_date_text(self):
return datetime.strftime("%b %d, %Y", self.first_eligible_appointment_date) return self.first_eligible_appointment_date.strftime("%b %d, %Y")
@property @property
def last_eligible_appointment_date_text(self): def last_eligible_appointment_date_text(self):
return datetime.strftime("%b %d, %Y", self.last_eligible_appointment_date) return self.last_eligible_appointment_date.strftime("%b %d, %Y")
@property @property
def registration_end_date_text(self): def registration_end_date_text(self):
return datetime.strftime("%b %d, %Y at %H:%M UTC", self.registration_end_date) return date_utils.get_default_time_display(self.registration_end_date)
@property @property
def current_test_center_exam(self): def current_test_center_exam(self):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment