Changeset 569c377 for server

Timestamp:

Mar 10, 2011, 2:04:52 AM (14 years ago)

Author:

Quentin Smith <quentin@…>

Branches:

no-cups

Children:

7a1c039

Parents:

0e5cdb3

git-author:

Quentin Smith <quentin@…> (03/10/11 02:04:52)

git-committer:

Quentin Smith <quentin@…> (03/10/11 02:04:52)

Message:

Err, make it work

Location:

server/lib

Files:

• ippattribute.py (modified) (1 diff)
• ippattributegroup.py (modified) (1 diff)
• ipprequest.py (modified) (1 diff)
• ippvalue.py (modified) (2 diffs)

server/lib/ippattribute.py

@@ -64 +64 @@
         for value in values:
             assert isinstance(value, Value), \
-                   "Value must be of type Value"
+                   "Value %r must be of type Value" % (value)
 
         self.name = name

server/lib/ippattributegroup.py

@@ -34 +34 @@
 
         if attribute_group_tag is not None:
-            assert isinstance(attribute_group_tag, char), \
+            assert isinstance(attribute_group_tag, int), \
                    "attribute_group_tag must be a character!"
             
 
         self.attribute_group_tag = attribute_group_tag
-        self.attributes[]
+        self.attributes = []
         self.extend(attributes)
 

server/lib/ipprequest.py

@@ -5 +5 @@
 from ippattribute import Attribute
 from ippvalue import Value
+from ippconstants import *
 
 # initialize logger

server/lib/ippvalue.py

@@ -99 +99 @@
             value = struct.unpack('>i', packed_value)[0]
         elif value_tag == IntegerTags.BOOLEAN:
-            value = struct.unpack('>?', packed_value)[0]
+            value = struct.unpack('>b', packed_value)[0]
         elif value_tag == IntegerTags.ENUM:
             value = struct.unpack('>i', packed_value)[0]
@@ -196 +196 @@
             packed_value = struct.pack('>i', self.value)
         elif self.value_tag == IntegerTags.BOOLEAN:
-            packed_value = struct.pack('>?', self.value)
+            packed_value = struct.pack('>b', self.value)
         elif self.value_tag == IntegerTags.ENUM:
             packed_value = struct.pack('>i', self.value)