Changeset 2646571 for server/lib/ipprequest.py

Timestamp:

Mar 5, 2011, 10:36:40 PM (13 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

cf1d291

Parents:

8979f90

git-author:

Jessica B. Hamrick <jhamrick@…> (03/05/11 22:36:40)

git-committer:

Jessica B. Hamrick <jhamrick@…> (03/05/11 22:36:40)

Message:

Update references to IPPTags and add import statements for IPPAttribute, IPPAttributeGroup, IPPValue

File:

• server/lib/ipprequest.py (modified) (4 diffs)

server/lib/ipprequest.py

@@ -2 +2 @@
 
 import sys, struct, logging
+from ippattributegroup import IPPAttributeGroup
+from ippattribute import IPPAttribute
+from ippvalue import IPPValue
 
 # initialize logger
@@ -108 +111 @@
             # as long as the next byte isn't signaling the end of the
             # attributes, keep looping and parsing attributes
-            while next_byte != IPPTags.END_OF_ATTRIBUTES_TAG:
+            while next_byte != AttributeTags.END:
                 
                 attribute_group_tag = next_byte
@@ -130 +133 @@
                     logger.debug("name-length : %i" % name_length)
                     
-                    if name_length != IPPTags.ZERO_NAME_LENGTH:
+                    if name_length != AttributeTags.ZERO_NAME_LENGTH:
                         # read the name (a string of name_length bytes)
                         name          = request.read(name_length)
@@ -209 +212 @@
 
         # conver the end-of-attributes-tag to binary
-        end_of_attributes_tag = struct.pack('>b', IPPTags.END_OF_ATTRIBUTES_TAG)
+        end_of_attributes_tag = struct.pack('>b', AttributeTags.END)
 
         # convert the data to binary