Changeset ffbe41d for server/lib/gutenbach/ipp/core/attribute.py

Timestamp:

Jan 10, 2012, 7:25:33 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

b01b6d1

Parents:

ce2abc5

git-author:

Jessica B. Hamrick <jhamrick@…> (01/10/12 19:25:33)

git-committer:

Jessica B. Hamrick <jhamrick@…> (01/10/12 19:25:33)

Message:

Clean up core ipp code a bit

File:

• server/lib/gutenbach/ipp/core/attribute.py (modified) (4 diffs)

server/lib/gutenbach/ipp/core/attribute.py

@@ -59 +59 @@
         """
 
-        if name is not None:
-            assert isinstance(name, str), \
-                   "Attribute name must be a string!"
+        if name is not None and not isinstance(name, str):
+            raise ValueError("attribute name must be a string")
         if values is None:
             values = []
         for value in values:
-            assert isinstance(value, Value), \
-                   "Value %s must be of type Value" % (value,)
+            if not isinstance(value, Value):
+                raise ValueError("value %s must be of type Value" % (value,))
 
         self.name = name
@@ -83 +82 @@
         """
 
-        assert self.name is not None, \
-               "cannot pack unnamed attribute!"
-        assert len(self.values) > 0, \
-               "cannot pack empty attribute!"
+        if self.name is None:
+            raise ValueError, "cannot pack unnamed attribute"
+        if len(self.values) == 0:
+            raise ValueError, "cannot pack empty attribute"
 
         # get the binary data for all the values
@@ -94 +93 @@
             # get the name length (0 for everything but the first
             # value)
-            if i == 0:
-                name_length = len(self.name)
-            else:
-                name_length = 0
+            name_length = len(self.name) if i == 0 else 0
 
             logger.debug("dumping name : %s" % self.name)
@@ -113 +109 @@
             # the value tag in binary
             tag_bin = struct.pack('>b', v.tag)
-
             # the name length in binary
             name_length_bin = struct.pack('>h', name_length)
-
             # the name in binary
             name_bin = self.name
-
             # the value length in binary
             value_length_bin = struct.pack('>h', value_length)
 
+            # add the binary value to the list of values
+            vlist = [tag_bin, name_length_bin, value_length_bin, value_bin]
             if i == 0:
-                values.append(''.join([tag_bin,
-                                       name_length_bin,
-                                       name_bin,
-                                       value_length_bin,
-                                       value_bin]))
-            else:
-                values.append(''.join([tag_bin,
-                                       name_length_bin,
-                                       value_length_bin,
-                                       value_bin]))
+                vlist.insert(2, name_bin)
+            values.append(''.join(vlist))
 
         # concatenate everything together and return it along with the