Changeset ebf327d for server/lib/ipprequest.py

Timestamp:

Mar 5, 2011, 10:42:40 PM (14 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

5cfb358

Parents:

cf1d291

git-author:

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

git-committer:

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

Message:

Change IPPValue, IPPAttribute, IPPAttributeGroup, and IPPRequest to Value, Attribute, AttributeGroup?, and Request, respectively, to make things a little less verbose

File:

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

server/lib/ipprequest.py

@@ -2 +2 @@
 
 import sys, struct, logging
-from ippattributegroup import IPPAttributeGroup
-from ippattribute import IPPAttribute
-from ippvalue import IPPValue
+from ippattributegroup import AttributeGroup
+from ippattribute import Attribute
+from ippvalue import Value
 
 # initialize logger
 logger = logging.getLogger("ippLogger")
 
-class IPPRequest():
+class Request():
     """
     From RFC 2565:
@@ -39 +39 @@
                  attribute_groups=[], data=None, request=None, length=sys.maxint):
         """
-        Create an IPPRequest.  Takes either the segments of the
-        request separately, or a file handle for the request to parse.
-        If the file handle is passed in, all other arguments are
-        ignored.
+        Create a Request.  Takes either the segments of the request
+        separately, or a file handle for the request to parse.  If the
+        file handle is passed in, all other arguments are ignored.
 
         Keyword arguments for passing in the segments of the request:
@@ -56 +55 @@
                           request itself.
 
-            attribute_groups -- a list of IPPAttributes, at least length 1
+            attribute_groups -- a list of Attributes, at least length 1
 
             data -- (optional) variable length, containing the actual
@@ -77 +76 @@
             # make sure the request id isn't empty
             assert request_id is not None
-            # make sure attribute_groups is a list of IPPAttributes
+            # make sure attribute_groups is a list of Attributes
             assert len(attribute_groups) > 0
-            for a in attribute_groups: assert isinstance(a, IPPAttributeGroup)
+            for a in attribute_groups: assert isinstance(a, AttributeGroup)
             
         # if the request isn't None, then we'll read directly from
@@ -148 +147 @@
                         length -= value_length
                         
-                        ippvalue = IPPValue(value_tag, value)
+                        ippvalue = Value(value_tag, value)
                         logger.debug("value : %s" % ippvalue.value)
 
-                        # create a new IPPAttribute from the data we just
+                        # create a new Attribute from the data we just
                         # read in, and add it to our attributes list
-                        attributes.append(IPPAttribute(name, [ippvalue]))
+                        attributes.append(Attribute(name, [ippvalue]))
 
                     else:
@@ -165 +164 @@
                         length -= value_length
 
-                        ippvalue = IPPValue(value_tag, value)
+                        ippvalue = Value(value_tag, value)
                         logger.debug("value : %s" % ippvalue.value)
 
@@ -175 +174 @@
                     length -= 1
 
-                self.attribute_groups.append(IPPAttributeGroup(attribute_group_tag, attributes))
+                self.attribute_groups.append(AttributeGroup(
+                    attribute_group_tag, attributes))
 
             # once we hit the end-of-attributes tag, the only thing