Changeset 4603

Timestamp:

04/29/09 03:12:17 (4 years ago)

Author:

getxsick

Message:

refactoring and bug fixes for Protocol class
- remove validation checking for getattr and setattr

(it's checked anyway by calling get_field())

- better arg checking for set_fields:

+ parity of *args
+ validation of keys before transaction have begun

- rewrite get_flags() internally
- parity check for set_flags()
- bug fixing for concat strings with other objects
- bug fixing for self.name which doesn't work because of getattr()
- replace of some methods in the class structure

Files:

• branch/UMPA/umpa/protocols/_protocols.py (modified) (8 diffs)

branch/UMPA/umpa/protocols/_protocols.py

@@ -84 +84 @@
         """
         
-        if self._is_valid(attr):
-            return self.get_field(attr).get()
-        else:
-            raise UMPAAttributeException(attr + ' is not allowed')
+        return self.get_field(attr).get()
 
     def __setattr__(self, attr, value):
@@ -99 +96 @@
         """
 
-        if self._is_valid(attr):
-            self.get_field(attr).set(value)
-        else:
-            raise UMPAAttributeException(attr + ' is not allowed')
+        self.get_field(attr).set(value)
 
     def __str__(self):
@@ -121 +115 @@
         return super(Protocol, self).__str__()
 
+    def _is_valid(self, field):
+        """
+        Validate if the filed is allowed.
+
+        @param field: requested field.
+
+        @rtype: C{bool}
+        @return: result of the validation.
+        """
+
+        return field in self._fields
+
     @classmethod
     def get_fields_keys(cls):
@@ -171 +177 @@
         """
         
+        if len(args) % 2:
+            raise UMPAAttributeException('wrong amount of passed arguments')
         # converting args list to the dict and update our kwargs
         kwargs.update(_dict_from_sequence(args))
 
+        # first check if all keys are valid to avoid partial-changing
         for key in kwargs:
-            if self._is_valid(key):
-                setattr(self, key, kwargs[key])
+            if not self._is_valid(key):
+                raise UMPAAttributeException(key + ' is not allowed; '
+                                            'nothing has changed')
+
+        for key in kwargs:
+            setattr(self, key, kwargs[key])
+
+    def get_flags(self, name, *args):
+        """
+        Return flags of the field.
+
+        @type name: C{str}
+        @param name: name of the field.
+
+        @param args: names of flags.
+
+        @rtype: C{list}
+        @return: list of flags.
+        """
+
+        flag_field = self.get_field(name)
+        if not isinstance(flag_field, Flags):
+            raise UMPAAttributeException("No Flags instance for " + name)
+        return flag_field.get(*args)
 
     def set_flags(self, name, *args, **kwargs):
@@ -194 +225 @@
         """
 
+        if len(args) % 2:
+            raise UMPAAttributeException('wrong amount of passed arguments')
         # converting args list to the dict and update our kwargs
         kwargs.update(_dict_from_sequence(args))
@@ -207 +240 @@
             raise UMPAAttributeException("No Flags instance for " + name)
 
-    def get_flags(self, name, *args):
-        """
-        Return flags of the field.
-
-        @type name: C{str}
-        @param name: name of the field.
-
-        @param args: names of flags.
-
-        @rtype: C{list}
-        @return: list of flags.
-        """
-
-        flag_field = self.get_field(name)
-        if isinstance(flag_field, Flags):
-            return flag_field.get(*args)
-        else:
-            raise UMPAAttributeException("No Flags instance for " + name)
-
     def get_offset(self, field):
         """
@@ -245 +259 @@
             field_list = [ f for f in self.get_fields() ]
         else:
-            raise UMPAException(type(field) + ' unsupported')
+            raise UMPAException(str(type(field)) + ' unsupported')
     
         if field not in field_list:
-            raise UMPAAttributeException(field + ' is not allowed')
+            raise UMPAAttributeException(repr(field) + ' is not allowed')
 
         offset = 0
@@ -380 +394 @@
         # protocol should return byte-compatible length
         if bit % BYTE != 0:
-            raise UMPAException('odd number of bits in ' + self.__name__)
+            raise UMPAException('odd number of bits in ' + str(self.name))
 
         self.__dict__['__raw_value'] = raw_value
         return raw_value, bit
-
-    def _is_valid(self, field):
-        """
-        Validate if the filed is allowed.
-
-        @param field: requested field.
-
-        @rtype: C{bool}
-        @return: result of the validation.
-        """
-
-        return field in self._fields