Changeset 12331

Timestamp:

28 Dec 2014, 07:53:48 (10 years ago)

Author:

Henrik Bettermann

Message:

We have to meet the entire interface when creating a new ProductOption? instance from string. We cannozt expect that string in import files are marked unicode.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/products

Files:

• productoptions.py (modified) (1 diff)
• tests/test_productoptions.py (modified) (2 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/products/productoptions.py

@@ -73 +73 @@
         try:
             fee = Decimal(fee)
+            title = unicode(title)
+            currency = unicode(currency)
         except TypeError:
             pass

main/waeup.ikoba/trunk/src/waeup/ikoba/products/tests/test_productoptions.py

@@ -65 +65 @@
         myinput = u"(u'%s',u'%s',u'%s')" % (
             self.valid_title, self.valid_fee, self.valid_currency)
+        myinput2 = u"('%s','%s','%s')" % (
+            self.valid_title, self.valid_fee, self.valid_currency)
         item1 = ProductOption.from_string(myinput)
         item2 = ProductOption.from_string(u"(u'', u'', u'')")
         item3 = ProductOption.from_string(u"(None, None, None)")
+        item4 = ProductOption.from_string(myinput2)
         self.assertEqual(item1.title, self.valid_title)
         self.assertEqual(item1.fee, self.valid_fee)
@@ -77 +80 @@
         self.assertTrue(item3.fee is None)
         self.assertEqual(item3.currency, None)
+        self.assertEqual(item4.title, self.valid_title)
+        self.assertEqual(item4.fee, self.valid_fee)
+        self.assertEqual(item4.currency, self.valid_currency)
         return