Changeset 4927

Timestamp:

06/24/09 06:22:29 (4 years ago)

Author:

getxsick

Message:

Fix for #333. printing packets show shortnames in output.

Location:

branch/UMPA

Files:

• tests/unit/test_protocols/test__protocols.py (modified) (2 diffs)
• umpa/protocols/_fields.py (modified) (3 diffs)
• umpa/protocols/_protocols.py (modified) (2 diffs)

branch/UMPA/tests/unit/test_protocols/test__protocols.py

@@ -46 +46 @@
         assert p.b == 1
         assert p.c == 1
+
+        assert p.get_field('a')._shortname == 'a'
 
     def test_getattr(self):
@@ -194 +196 @@
         py.test.raises(UMPAException, p.get_offset, 10)
         py.test.raises(UMPAException, p.get_offset, self.cls_proto)
-        py.test.raises(UMPAException, "p.get_offset(self.cls_proto('x'))")
         py.test.raises(UMPAException, p.get_offset, False)
 

branch/UMPA/umpa/protocols/_fields.py

@@ -90 +90 @@
 
         if self.auto:
-            return "| +-[ %-25s ]\t\t%s (auto - %s)" % (self.name,
-                                        str(self._value), str(self.fillout()))
-        else:
-            return "| +-[ %-25s ]\t\t%s" % (self.name, str(self._value))
+            return "| +-[ %-25s ]\t%-15s : %s (auto - %s)" % (self.name,
+                        self._shortname, str(self._value), str(self.fillout()))
+        else:
+            return "| +-[ %-25s ]\t%-15s : %s" % (self.name,
+                                            self._shortname, str(self._value))
 
     def __repr__(self):
@@ -651 +652 @@
         """
 
-        print "| +-[ %-25s ]" % self.name
+        print "| +-[ %-25s ]\t%s" % (self.name, self._shortname)
         print "| | \\"
         for bit in self._ordered_fields:
             print self._value[bit]
         print "| | /"
-        return "| \\-[ %-25s ]\t\tcontains %d bit flags" % (self.name,
+        return "| \\-[ %-25s ]\tcontains %d bit flags" % (self.name,
                                                     len(self._ordered_fields))
 
@@ -829 +830 @@
         """
 
-        return "| |  -{ %-23s }\t\t%d" % (self.name, int(bool(self._value)))
+        return "| |  -{ %-23s }\t%d" % (self.name, int(bool(self._value)))
 
     def get(self):

branch/UMPA/umpa/protocols/_protocols.py

@@ -74 +74 @@
             setattr(self, field, preset[field])
 
+        # short-fieldname update
+        for field in fields:
+            self.get_field(field)._shortname = field
+
     def __getattr__(self, attr):
         """
@@ -111 +115 @@
         for field in self.get_fields():
             print field
-        print "\\-< %-27s >\t\tcontains %d fields" % (self.name,
+        print "\\-< %-27s >\tcontains %d fields" % (self.name,
                                                             len(self._fields))
         return super(Protocol, self).__str__()