Merge

stephenmcd · Mar 1, 2014 · 603fda3 · 603fda3
2 parents 18fc891 + 628bd20
commit 603fda3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/cartridge/shop/utils.py b/cartridge/shop/utils.py
@@ -110,7 +110,7 @@ def set_shipping(request, shipping_type, shipping_total):
     """
     from future.builtins import str
     request.session["shipping_type"] = str(shipping_type)
-    request.session["shipping_total"] = shipping_total
+    request.session["shipping_total"] = str(shipping_total)
 
 
 def set_tax(request, tax_type, tax_total):
@@ -119,7 +119,7 @@ def set_tax(request, tax_type, tax_total):
     """
     from future.builtins import str
     request.session["tax_type"] = str(tax_type)
-    request.session["tax_total"] = tax_total
+    request.session["tax_total"] = str(tax_total)
 
 
 def sign(value):

diff --git a/setup.py b/setup.py
@@ -41,10 +41,6 @@
             "pisa >= 3.0.33",
             "reportlab == 2.7"
         ],
-        # NOTE: reportlab 3.0 does not work with pisa 3.0.33, due to a
-        # bad version check. 
-        # However, reportlab 2.7 will not work with Python 3!
-        # 
 
         classifiers=[
             "Development Status :: 4 - Beta",