Add Django 1.4 timezone aware datetime support

cart/cart.py

@@ -1,4 +1,3 @@
-import datetime
 import models
 
 CART_ID = 'CART-ID'
@@ -26,7 +25,7 @@ def __iter__(self):
             yield item
 
     def new(self, request):
-        cart = models.Cart(creation_date=datetime.datetime.now())
+        cart = models.Cart()
         cart.save()
         request.session[CART_ID] = cart.id
         return cart
@@ -66,6 +65,10 @@ def update(self, product, quantity, unit_price=None):
                 cart=self.cart,
                 product=product,
             )
+            item.quantity = int(quantity)
+            if unit_price is not None:
+                item.unit_price = unit_price
+            item.save()
         except models.Item.DoesNotExist:
             raise ItemDoesNotExist
 

cart/models.py

@@ -2,9 +2,15 @@
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes import generic
+try:
+    from django.utils import timezone
+except ImportError:
+    from datetime import datetime as timezone
+
 
 class Cart(models.Model):
-    creation_date = models.DateTimeField(verbose_name=_('creation date'))
+    creation_date = models.DateTimeField(
+        verbose_name=_('creation date'), default=timezone.now)
     checked_out = models.BooleanField(default=False, verbose_name=_('checked out'))
 
     class Meta:
@@ -47,7 +53,7 @@ def total_price(self):
 
     # product
     def get_product(self):
-        return self.content_type.get_object_for_this_type(id=self.object_id)
+        return self.content_type.get_object_for_this_type(pk=self.object_id)
 
     def set_product(self, product):
         self.content_type = ContentType.objects.get_for_model(type(product))

cart/tests.py

@@ -1,12 +1,15 @@
 from django.test import TestCase
 from models import Cart, Item
 from django.contrib.auth.models import User
-import datetime
 from decimal import Decimal
+try:
+    from django.utils import timezone
+except ImportError:
+    from datetime import datetime as timezone
 
 class CartAndItemModelsTestCase(TestCase):
 
-    def _create_cart_in_database(self, creation_date=datetime.datetime.now(), 
+    def _create_cart_in_database(self, creation_date=timezone.now(), 
             checked_out=False):
         """
             Helper function so I don't repeat myself
@@ -41,7 +44,7 @@ def _create_user_in_database(self):
         return user
 
     def test_cart_creation(self):
-        creation_date = datetime.datetime.now()
+        creation_date = timezone.now()
         cart = self._create_cart_in_database(creation_date)
         id = cart.id
 

setup.py

@@ -8,7 +8,7 @@ def read(fname):
 
 setup(
         name='django-cart',
-        version='1.0.1',
+        version='1.0.2',
         description='Django simple shopping cart, tests and south migrations included',
         maintainer='Bruno Carvalho',
         maintainer_email='[email protected]',