Move tz_aware into connection config rather than settings.

Make django use_tz

common/lib/capa/capa/inputtypes.py

@@ -144,11 +144,11 @@ class InputTypeBase(object):
         self.tag = xml.tag
         self.system = system
 
-        # # NOTE: ID should only come from one place.  If it comes from multiple,
-        # # we use state first, XML second (in case the xml changed, but we have
-        # # existing state with an old id). Since we don't make this guarantee,
-        # # we can swap this around in the future if there's a more logical
-        # # order.
+        # NOTE: ID should only come from one place.  If it comes from multiple,
+        # we use state first, XML second (in case the xml changed, but we have
+        # existing state with an old id). Since we don't make this guarantee,
+        # we can swap this around in the future if there's a more logical
+        # order.
 
         self.input_id = state.get('id', xml.get('id'))
         if self.input_id is None:

common/lib/xmodule/xmodule/capa_module.py

@@ -747,7 +747,7 @@ class CapaModule(CapaFields, XModule):
 
         # Problem queued. Students must wait a specified waittime before they are allowed to submit
         if self.lcp.is_queued():
-            current_time = datetime.datetime.now()
+            current_time = datetime.datetime.now(UTC)
             prev_submit_time = self.lcp.get_recentmost_queuetime()
             waittime_between_requests = self.system.xqueue['waittime']
             if (current_time - prev_submit_time).total_seconds() < waittime_between_requests:

common/lib/xmodule/xmodule/course_module.py

@@ -93,7 +93,7 @@ class Textbook(object):
             # see if we already fetched this
             if toc_url in _cached_toc:
                 (table_of_contents, timestamp) = _cached_toc[toc_url]
-                age = datetime.now() - timestamp
+                age = datetime.now(UTC) - timestamp
                 # expire every 10 minutes
                 if age.seconds < 600:
                     return table_of_contents

common/lib/xmodule/xmodule/modulestore/mongo.py

@@ -231,6 +231,7 @@ class MongoModuleStore(ModuleStoreBase):
         self.collection = pymongo.connection.Connection(
             host=host,
             port=port,
+            tz_aware=True,
             **kwargs
         )[db][collection]
 

common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py

@@ -43,7 +43,7 @@ class TestMongoModuleStore(object):
     def initdb():
         # connect to the db
         store = MongoModuleStore(HOST, DB, COLLECTION, FS_ROOT, RENDER_TEMPLATE,
-            default_class=DEFAULT_CLASS, tz_aware=True)
+            default_class=DEFAULT_CLASS)
         # Explicitly list the courses to load (don't want the big one)
         courses = ['toy', 'simple']
         import_from_xml(store, DATA_DIR, courses)

common/lib/xmodule/xmodule/tests/test_capa_module.py

@@ -18,6 +18,7 @@ from xmodule.modulestore import Location
 from django.http import QueryDict
 
 from . import test_system
+from pytz import UTC
 
 
 class CapaFactory(object):
@@ -126,7 +127,7 @@ class CapaFactory(object):
 class CapaModuleTest(unittest.TestCase):
 
     def setUp(self):
-        now = datetime.datetime.now()
+        now = datetime.datetime.now(UTC)
         day_delta = datetime.timedelta(days=1)
         self.yesterday_str = str(now - day_delta)
         self.today_str = str(now)
@@ -475,12 +476,12 @@ class CapaModuleTest(unittest.TestCase):
 
         # Simulate that the problem is queued
         with patch('capa.capa_problem.LoncapaProblem.is_queued') \
-                as mock_is_queued,\
+                as mock_is_queued, \
             patch('capa.capa_problem.LoncapaProblem.get_recentmost_queuetime') \
                 as mock_get_queuetime:
 
             mock_is_queued.return_value = True
-            mock_get_queuetime.return_value = datetime.datetime.now()
+            mock_get_queuetime.return_value = datetime.datetime.now(UTC)
 
             get_request_dict = {CapaFactory.input_key(): '3.14'}
             result = module.check_problem(get_request_dict)