Changeset 12327 for main/waeup.ikoba/trunk/src/waeup/ikoba/utils

Timestamp:

26 Dec 2014, 20:18:17 (10 years ago)

Author:

Henrik Bettermann

Message:

Rename ProductOptionEntry? ProductOption?.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/utils

Files:

• converters.py (modified) (3 diffs)
• tests/test_converters.py (modified) (4 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/utils/converters.py

@@ -30 +30 @@
 from zope.schema.interfaces import IList
 from waeup.ikoba.interfaces import (
-    IObjectConverter, IProductOptionEntryField, IFieldConverter,
+    IObjectConverter, IProductOptionField, IFieldConverter,
     DELETION_MARKER, IGNORE_MARKER)
 from waeup.ikoba.schema.interfaces import IPhoneNumber
-from waeup.ikoba.products.productoptions import ProductOptionEntry
+from waeup.ikoba.products.productoptions import ProductOption
 
 class ExtendedCheckBoxWidget(CheckBoxWidget):
@@ -175 +175 @@
         return result
 
-class ProductOptionEntryConverter(grok.Adapter):
-    grok.context(IProductOptionEntryField)
+class ProductOptionConverter(grok.Adapter):
+    grok.context(IProductOptionField)
     grok.implements(IFieldConverter)
 
     def request_data(self, name, value, schema_field, prefix='',
                      mode='create'):
-        """Turn CSV values into ProductOptionEntry-compatible form data.
+        """Turn CSV values into ProductOption-compatible form data.
 
         Expects as `value` a _string_ like ``(u'mytitle',
@@ -194 +194 @@
         where the values are tokens from appropriate sources.
 
-        Such dicts can be transformed into real ProductOptionEntry objects by
+        Such dicts can be transformed into real ProductOption objects by
         input widgets used in converters.
         """
         try:
-            entry = ProductOptionEntry.from_string(value)
+            entry = ProductOption.from_string(value)
             title, fee, currency = entry.title, entry.fee, entry.currency
         except:

main/waeup.ikoba/trunk/src/waeup/ikoba/utils/tests/test_converters.py

@@ -38 +38 @@
     SimpleIkobaVocabulary, IFieldConverter,
     DELETION_MARKER, IGNORE_MARKER)
-from waeup.ikoba.products.productoptions import ProductOptionEntryField
+from waeup.ikoba.products.productoptions import ProductOptionField
 from waeup.ikoba.utils.converters import (
     IObjectConverter, IFieldConverter, DefaultFieldConverter,
-    ListFieldConverter, PhoneNumberFieldConverter, ProductOptionEntryConverter,
+    ListFieldConverter, PhoneNumberFieldConverter, ProductOptionConverter,
     DefaultObjectConverter)
 from waeup.ikoba.utils.helpers import attrs_to_fields
@@ -94 +94 @@
     options = schema.List(
         title = u'Options',
-        value_type = ProductOptionEntryField(),
+        value_type = ProductOptionField(),
         required = True,
         default = [],
@@ -137 +137 @@
         obj2 = ListFieldConverter(None)
         obj3 = PhoneNumberFieldConverter(None)
-        obj4 = ProductOptionEntryConverter(None)
+        obj4 = ProductOptionConverter(None)
         verify.verifyObject(IFieldConverter, obj1)
         verify.verifyObject(IFieldConverter, obj2)
@@ -145 +145 @@
         verify.verifyClass(IFieldConverter, ListFieldConverter)
         verify.verifyClass(IFieldConverter, PhoneNumberFieldConverter)
-        verify.verifyClass(IFieldConverter, ProductOptionEntryConverter)
+        verify.verifyClass(IFieldConverter, ProductOptionConverter)
         return