Changeset c269bc7 for server/lib/ippattributegroup.py

Timestamp:

Mar 7, 2011, 7:47:42 PM (14 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

fa0d0ef

Parents:

5cfb358

git-author:

Jessica B. Hamrick <jhamrick@…> (03/07/11 19:47:42)

git-committer:

Jessica B. Hamrick <jhamrick@…> (03/07/11 19:47:42)

Message:

Update API for Value, Attribute, and AttributeGroup?

File:

• server/lib/ippattributegroup.py (modified) (3 diffs)

server/lib/ippattributegroup.py

@@ -13 +13 @@
     """
 
-    def __init__(self, attribute_group_tag, attributes=[]):
+    def __init__(self, attribute_group_tag=None, attributes=[]):
         """
-        Initialize an AttributeGroup.
+        Initialize an AttributeGroup.  An AttributeGroup can be
+        initialized in three ways:
+
+            AttributeGroup()
+            AttributeGroup(attribute_group_tag)
+            AttributeGroup(attribute_group_tag, attributes)
 
         Arguments:
@@ -22 +27 @@
                                    attribute group
 
-            attributes -- (optional) a list of attributes
+            attributes -- a list of attributes
         """
 
-        # make sure attribute_group_tag isn't empty
-        assert attribute_group_tag is not None
+        if attribute_group_tag is not None:
+            assert isinstance(attribute_group_tag, char), \
+                   "attribute_group_tag must be a character!"
+            
 
-        # make sure attributes is a list or tuple of Attributes
-        assert isinstance(attributes, (list, tuple))
-        for a in attributes: assert isinstance(a, Attribute)
+        if len(attributes) > 0:
+            for a in attributes:
+                assert isinstance(a, Attribute), \
+                       "attribute must be of type Attribute!"
 
         self.attribute_group_tag = attribute_group_tag
@@ -36 +44 @@
 
     def getAttribute(self, name):
+        """
+        Returns a list of attributes which have name 'name'.
+        """
+        
         return filter(lambda x: x.name == name, self.attributes)
 
-    def toBinaryData(self):
+    def getTag(self):
+        """
+        Return the attribute group tag.
+        """
+
+        return self.attribute_group_tag
+
+    def getAttributes(self):
+        """
+        Return the list of attributes in this attribue group.
+        """
+
+        return self.attributes
+
+    def setAttributes(self, attributes):
+        """
+        Sets the attributes for the attribute group.
+        """
+
+        for a in attributes:
+            assert isinstance(a, Attribute), \
+                   "attribute must be of type Attribute!"
+
+        self.attributes = attributes
+
+    def addAttribute(self, attribute):
+        """
+        Adds an attribute to the list of attributes for the attribute
+        group.
+        """
+        
+        assert isinstance(attribute, Attribute), \
+               "attribute must be of type Attribute!"
+
+        self.attributes.append(attribute)
+
+    def setTag(self, tag):
+        """
+        Sets the attribute group tag.
+        """
+
+        assert isinstance(tag, char), \
+               "attribute tag must be a character!"
+
+        self.attribute_group_tag = tag
+
+    def pack(self):
         """
         Convert the AttributeGroup to binary.