Change the way we handle Group Operations

pyipptool/templates/ipp/group_tuple.pt

@@ -0,0 +1,5 @@
+<tal:block tal:define="item_template item_template|field.widget.item_template;">
+    <b tal:replace="python: 'GROUP %s' % field.name.replace('_', '-')"/>
+    <tal:block tal:repeat="child field"
+               tal:replace="child.render_template(item_template)"/>
+</tal:block>

pyipptool/widgets.py

@@ -24,17 +24,6 @@ def serialize(self, field, cstruct=None, readonly=False):
         return 'FILE {}'.format(cstruct)
 
 
-class IPPGroupWidget(Widget):
-    def serialize(self, field, cstruct=None, readonly=False):
-        name = field.name
-        while field.parent is not None:
-            field = field.parent
-        value = getattr(field.schema, name)
-        if value is colander.null:
-            return ''
-        return 'GROUP {}'.format(value)
-
-
 class IPPAttributeWidget(Widget):
     def serialize(self, field, cstruct=None, readonly=False):
         if cstruct is colander.null:
@@ -55,8 +44,8 @@ class IPPBodyWidget(MappingWidget):
     item_template = 'ipp/item'
 
 
-class IPPTupleWidget(SequenceWidget):
-    readonly_template = 'ipp/tuple'
+class IPPGroupWidget(SequenceWidget):
+    readonly_template = 'ipp/group_tuple'
     template = readonly_template
     item_template = 'ipp/item'
 

tests/test_async_subprocess.py

@@ -79,7 +79,7 @@ def do_POST(self):
         wrapper.config['cups_uri'] = 'http://localhost:%s/' % PORT
 
         request = get_subscriptions_form.render(
-            {'operation_attributes':
+            {'operation_attributes_tag':
              {'printer_uri': 'http://localhost:%s/printers/fake' % PORT}}
         )