Changeset ffbe41d for server/lib/gutenbach/ipp/core/request.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/request.py (modified) (7 diffs)

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

@@ -71 +71 @@
         if request is None:
             # make sure the version number isn't empty
-            assert version is not None
+            if version is None:
+                raise ValueError("version must not be None")
             # make sure verison is a tuple of length 2
-            assert isinstance(version, tuple)
-            assert len(version) == 2
+            if not hasattr(version, '__iter__'):
+                raise ValueError("version must be iterable")
+            if len(version) != 2:
+                raise ValueError("version must be of length 2")
             # make sure the operation id isn't empty
-            assert operation_id is not None
+            if operation_id is None:
+                raise ValueError("operation_id may not be None")
             # make sure the request id isn't empty
-            assert request_id is not None
+            if request_id is None:
+                raise ValueError("request_id may not be None")
             # make sure attribute_groups is a list of Attributes
-            for a in attribute_groups: assert isinstance(a, AttributeGroup)
+            for a in attribute_groups:
+                if not isinstance(a, AttributeGroup):
+                    raise ValueError("attribute not of type AttributeGroup")
             
         # if the request isn't None, then we'll read directly from
@@ -90 +97 @@
             
             # read the version-number (two signed chars)
-            self.version        = struct.unpack('>bb', request.read(2))
+            self.version = struct.unpack('>bb', request.read(2))
             length -= 2
             logger.debug("version-number : (0x%X, 0x%X)" % self.version)
@@ -96 +103 @@
             # read the operation-id (or status-code, but that's only
             # for a response) (signed short)
-            self.operation_id   = struct.unpack('>h', request.read(2))[0]
+            self.operation_id = struct.unpack('>h', request.read(2))[0]
             length -= 2
             logger.debug("operation-id : 0x%X" % self.operation_id)
 
             # read the request-id (signed int)
-            self.request_id     = struct.unpack('>i', request.read(4))[0]
+            self.request_id = struct.unpack('>i', request.read(4))[0]
             length -= 4
             logger.debug("request-id : 0x%X" % self.request_id)
@@ -130 +137 @@
                     
                     # read in the value tag (signed char)
-                    value_tag     = next_byte
+                    value_tag = next_byte
                     logger.debug("value-tag : 0x%X" % value_tag)
                     
                     # read in the length of the name (signed short)
-                    name_length   = struct.unpack('>h', request.read(2))[0]
+                    name_length = struct.unpack('>h', request.read(2))[0]
                     length -= 2
                     logger.debug("name-length : %i" % name_length)
@@ -140 +147 @@
                     if name_length != AttributeTags.ZERO_NAME_LENGTH:
                         # read the name (a string of name_length bytes)
-                        name          = request.read(name_length)
+                        name = request.read(name_length)
                         length -= name_length
                         logger.debug("name : %s" % name)
                     
                         # read in the length of the value (signed short)
-                        value_length  = struct.unpack('>h', request.read(2))[0]
+                        value_length = struct.unpack('>h', request.read(2))[0]
                         length -= 2
                         logger.debug("value-length : %i" % value_length)
                     
                         # read in the value (string of value_length bytes)
-                        value         = request.read(value_length)
+                        value = request.read(value_length)
                         length -= value_length
                         
@@ -162 +169 @@
                     else:
                         # read in the length of the value (signed short)
-                        value_length  = struct.unpack('>h', request.read(2))[0]
+                        value_length = struct.unpack('>h', request.read(2))[0]
                         length -= 2
                         logger.debug("value-length : %i" % value_length)
                     
                         # read in the value (string of value_length bytes)
-                        value         = request.read(value_length)
+                        value = request.read(value_length)
                         length -= value_length
 
@@ -214 +221 @@
 
         # make sure the version number isn't empty
-        assert self.version is not None
+        if self.version is None:
+            raise ValueError("version is None")
         # make sure verison is a tuple of length 2
-        assert isinstance(self.version, tuple)
-        assert len(self.version) == 2
+        if not hasattr(self.version, '__iter__'):
+            raise ValueError("version is not iterable")
+        if len(self.version) != 2:
+            raise ValueError("version is not of length 2")
         # make sure the operation id isn't empty
-        assert self.operation_id is not None
+        if self.operation_id is None:
+            raise ValueError("operation_id is None")
         # make sure the request id isn't empty
-        assert self.request_id is not None
+        if self.request_id is None:
+            raise ValueError("request_id is 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)
+        if len(self.attribute_groups) == 0:
+            raise ValueError("no attribute groups")
+        for a in self.attribute_groups:
+            if not isinstance(a, AttributeGroup):
+                raise ValueError("not of type AttributeGroup")
 
         # convert the version, operation id, and request id to binary