Changeset 1b9d629

Timestamp:

Mar 11, 2011, 1:50:39 PM (13 years ago)

Author:

Quentin Smith <quentin@…>

Branches:

no-cups

Children:

556a285

Parents:

dc37ed0

git-author:

Quentin Smith <quentin@…> (03/11/11 13:50:39)

git-committer:

Quentin Smith <quentin@…> (03/11/11 13:50:39)

Message:

Allow the specification of attribute groups after a request object is created

File:

• server/lib/ipp/request.py (modified) (2 diffs)

server/lib/ipp/request.py

@@ -78 +78 @@
             assert request_id is not None
             # make sure attribute_groups is a list of Attributes
-            assert len(attribute_groups) > 0
             for a in attribute_groups: assert isinstance(a, AttributeGroup)
             
@@ -203 +202 @@
         """
 
+        # make sure the version number isn't empty
+        assert self.version is not None
+        # make sure verison is a tuple of length 2
+        assert isinstance(self.version, tuple)
+        assert len(self.version) == 2
+        # make sure the operation id isn't empty
+        assert self.operation_id is not None
+        # make sure the request id isn't empty
+        assert self.request_id is not None
+        # make sure attribute_groups is a list of Attributes
+        assert len(self.attribute_groups) > 0
+        for a in self.attribute_groups: assert isinstance(a, AttributeGroup)
+
         # convert the version, operation id, and request id to binary
         preattributes = struct.pack('>bbhi',