Merge pull request #288 from elbaschid/fix/work_with_aware_datetimes

makes Oscar work with aware AND naive datetimes based on USE_TZ

oscar/apps/basket/abstract_models.py

@@ -1,10 +1,10 @@
 from decimal import Decimal
 import zlib
-import datetime
 
 from django.db import models
 from django.db.models import query
 from django.conf import settings
+from django.utils.timezone import now
 from django.utils.translation import ugettext as _
 from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
 
@@ -199,7 +199,7 @@ class AbstractBasket(models.Model):
         for line_to_merge in basket.all_lines():
             self.merge_line(line_to_merge, add_quantities)
         basket.status = MERGED
-        basket.date_merged = datetime.datetime.now()
+        basket.date_merged = now()
         basket.save()
         self._lines = None
 
@@ -220,7 +220,7 @@ class AbstractBasket(models.Model):
     def set_as_submitted(self):
         """Mark this basket as submitted."""
         self.status = SUBMITTED
-        self.date_submitted = datetime.datetime.now()
+        self.date_submitted = now()
         self.save()
 
     def set_as_tax_exempt(self):
@@ -386,7 +386,7 @@ class AbstractBasket(models.Model):
     @property
     def time_since_creation(self, test_datetime=None):
         if not test_datetime:
-            test_datetime = datetime.datetime.now()
+            test_datetime = now()
         return test_datetime - self.date_created
 
     @property

oscar/apps/basket/migrations/0003_auto__add_field_line_price_excl_tax.py

@@ -34,7 +34,7 @@ class Migration(SchemaMigration):
         },
         'auth.user': {
             'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 8, 24, 14, 47, 16, 749550)'}),
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
             'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
@@ -42,7 +42,7 @@ class Migration(SchemaMigration):
             'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
             'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 8, 24, 14, 47, 16, 749466)'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
             'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
             'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),

oscar/apps/dashboard/ranges/models.py

@@ -1,9 +1,8 @@
-import datetime
 import os
 import re
 from django.utils.translation import ugettext_lazy as _
 from django.db import models
-
+from django.utils.timezone import now
 
 Product = models.get_model('catalogue', 'Product')
 
@@ -40,14 +39,14 @@ class RangeProductFileUpload(models.Model):
         return os.path.basename(self.filepath)
 
     def mark_as_failed(self, message=None):
-        self.date_processed = datetime.datetime.now()
+        self.date_processed = now()
         self.error_message = message
         self.status = self.FAILED
         self.save()
 
     def mark_as_processed(self, num_new, num_unknown, num_duplicate):
         self.status = self.PROCESSED
-        self.date_processed = datetime.datetime.now()
+        self.date_processed = now()
         self.num_new_skus = num_new
         self.num_unknown_skus = num_unknown
         self.num_duplicate_skus = num_duplicate

oscar/apps/dashboard/views.py

@@ -1,6 +1,7 @@
+from datetime import timedelta
 from decimal import Decimal as D, ROUND_UP
-from datetime import datetime, timedelta
 
+from django.utils.timezone import now
 from django.views.generic import TemplateView
 from django.db.models.loading import get_model
 from django.db.models import Avg, Sum, Count
@@ -32,7 +33,7 @@ class IndexView(TemplateView):
         ``Queryset`` of site offers is filtered by end date greater then
         the current date.
         """
-        return ConditionalOffer.objects.filter(end_date__gt=datetime.now(),
+        return ConditionalOffer.objects.filter(end_date__gt=now(),
                                                offer_type=ConditionalOffer.SITE)
 
     def get_active_vouchers(self):
@@ -40,7 +41,7 @@ class IndexView(TemplateView):
         Get all active vouchers. The returned ``Queryset`` of vouchers
         is filtered by end date greater then the current date.
         """
-        return Voucher.objects.filter(end_date__gt=datetime.now())
+        return Voucher.objects.filter(end_date__gt=now())
 
     def get_number_of_promotions(self, abstract_base=AbstractPromotion):
         """
@@ -78,7 +79,7 @@ class IndexView(TemplateView):
         when generating the y-axis labels (default=10).
         """
         # Get datetime for 24 hours agao
-        time_now = datetime.now().replace(minute=0, second=0)
+        time_now = now().replace(minute=0, second=0)
         start_time = time_now - timedelta(hours=hours-1)
 
         orders_last_day = Order.objects.filter(date_placed__gt=start_time)
@@ -125,7 +126,7 @@ class IndexView(TemplateView):
         return ctx
 
     def get_stats(self):
-        datetime_24hrs_ago = datetime.now() - timedelta(hours=24)
+        datetime_24hrs_ago = now() - timedelta(hours=24)
 
         orders = Order.objects.filter()
         orders_last_day = orders.filter(date_placed__gt=datetime_24hrs_ago)

oscar/apps/offer/migrations/0005_auto__add_field_range_date_created.py

@@ -4,12 +4,15 @@ from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
 
+from django.utils.timezone import now
+
+
 class Migration(SchemaMigration):
 
     def forwards(self, orm):
 
         # Adding field 'Range.date_created'
-        db.add_column('offer_range', 'date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, default=datetime.datetime(2012, 5, 2, 22, 10, 11, 993563), blank=True), keep_default=False)
+        db.add_column('offer_range', 'date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, default=now(), blank=True), keep_default=False)
 
 
     def backwards(self, orm):

oscar/apps/order/abstract_models.py

@@ -1,9 +1,9 @@
 from itertools import chain
 from decimal import Decimal as D
 import hashlib
-import datetime
 
 from django.db import models
+from django.utils import timezone
 from django.contrib.auth.models import User
 from django.template.defaultfilters import slugify
 from django.utils.translation import ugettext_lazy as _
@@ -240,8 +240,8 @@ class AbstractOrderNote(models.Model):
     def is_editable(self):
         if self.note_type == self.SYSTEM:
             return False
-        return (datetime.datetime.now() - self.date_updated).seconds < self.editable_lifetime
-
+        delta = timezone.now() - self.date_updated
+        return delta.seconds < self.editable_lifetime
 
 class AbstractCommunicationEvent(models.Model):
     """

oscar/apps/order/migrations/0003_auto__del_field_ordernote_date__add_field_ordernote_date_created__add_.py

@@ -3,6 +3,8 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
+from django.utils.timezone import now
+
 
 class Migration(SchemaMigration):
 
@@ -11,7 +13,7 @@ class Migration(SchemaMigration):
         db.rename_column('order_ordernote', 'date', 'date_created')
 
         # Adding field 'OrderNote.date_updated'
-        db.add_column('order_ordernote', 'date_updated', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, default=datetime.datetime(2012, 4, 25, 12, 11, 37, 946052), blank=True), keep_default=False)
+        db.add_column('order_ordernote', 'date_updated', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, default=now(), blank=True), keep_default=False)
 
 
     def backwards(self, orm):

oscar/apps/order/migrations/0004_auto__add_field_line_upc.py

@@ -44,7 +44,7 @@ class Migration(SchemaMigration):
         },
         'auth.user': {
             'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 5, 16, 10, 6, 17, 973689)'}),
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
             'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
@@ -52,7 +52,7 @@ class Migration(SchemaMigration):
             'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
             'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 5, 16, 10, 6, 17, 973579)'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
             'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
             'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),

setup.py

@@ -27,7 +27,7 @@ setup(name='django-oscar',
       install_requires=[
           'django>=1.4',
           'PIL==1.1.7',
-          'South==0.7.3',
+          'South==0.7.6',
           'django-extra-views==0.2.0',
           'django-haystack==2.0.0-beta',
           'django-treebeard==1.61',

sites/sandbox/settings.py

@@ -5,6 +5,8 @@ PROJECT_DIR = os.path.dirname(__file__)
 location = lambda x: os.path.join(
     os.path.dirname(os.path.realpath(__file__)), x)
 
+USE_TZ = True
+
 DEBUG = True
 TEMPLATE_DEBUG = True
 SQL_DEBUG = True

tests/unit/order/model_tests.py

@@ -1,7 +1,8 @@
+from datetime import timedelta
 from decimal import Decimal as D
-import datetime
 
 from django.test import TestCase
+from django.utils import timezone
 import mock
 
 from oscar.apps.address.models import Country
@@ -71,15 +72,6 @@ class OrderStatusPipelineTests(TestCase):
             self.assertEqual('SHIPPED', line.status)
 
 
-class MockDateTime(datetime.datetime):
-
-    @classmethod
-    def stub(cls, method_name, return_value):
-        mocked_method = mock.Mock()
-        mocked_method.return_value = return_value
-        setattr(cls, method_name, mocked_method)
-
-
 class OrderNoteTests(TestCase):
 
     def setUp(self):
@@ -97,9 +89,10 @@ class OrderNoteTests(TestCase):
         OrderNote.editable_lifetime = 1
         note = self.order.notes.create(message='test')
         self.assertTrue(note.is_editable())
-        now = datetime.datetime.now()
-        with mock.patch('datetime.datetime', MockDateTime) as mock_datetime:
-            mock_datetime.stub('now', now + datetime.timedelta(seconds=30))
+
+        now = timezone.now()
+        with mock.patch.object(timezone, 'now') as mock_timezone:
+            mock_timezone.return_value = now + timedelta(seconds=30)
             self.assertFalse(note.is_editable())