Changeset 5746

Timestamp:

07/29/10 20:38:42 (3 years ago)

Author:

kosma

Message:

fix str to return strings, not print them

Location:

umpa/branches/link-layer-integration/umit/umpa

Files:

• _packets.py (modified) (1 diff)
• protocols/_fields.py (modified) (1 diff)
• protocols/_protocols.py (modified) (1 diff)

umpa/branches/link-layer-integration/umit/umpa/_packets.py

@@ -123 +123 @@
         """
 
-        print "Packet contains %d protocols" % len(self.protos)
-        for proto in self.protos:
-            print proto
-        return super(Packet, self).__str__()
+        info = []
+        info.append("Packet contains %d protocols" % len(self.protos))
+        info.extend([ str(proto) for proto in self.protos ])
+        info.append(super(Packet, self).__str__())
+
+        return "\n".join(info)
 
     def include(self, *protos):

umpa/branches/link-layer-integration/umit/umpa/protocols/_fields.py

@@ -652 +652 @@
         """
 
-        print "| +-[ %-25s ]\t%s" % (self.name, self._shortname)
-        print "| | \\"
-        for bit in self._ordered_fields:
-            print self._value[bit]
-        print "| | /"
-        return "| \\-[ %-25s ]\tcontains %d bit flags" % (self.name,
-                                                    len(self._ordered_fields))
+        info = []
+
+        info.append("| +-[ %-25s ]\t%s" % (self.name, self._shortname))
+        info.append("| | \\")
+        info.extend([ str(self._value[bit]) for bit in self._ordered_fields ])
+        info.append("| | /")
+        info.append("| \\-[ %-25s ]\tcontains %d bit flags" %
+                                       (self.name, len(self._ordered_fields)))
+
+        return "\n".join(info)
 
     def get(self, *names):

umpa/branches/link-layer-integration/umit/umpa/protocols/_protocols.py

@@ -111 +111 @@
         """
 
-        print "+-< %-27s >" % self.name
-        print "| \\"
-        for field in self.get_fields():
-            print field
-        print "\\-< %-27s >\tcontains %d fields" % (self.name,
-                                                            len(self._fields))
-        return super(Protocol, self).__str__()
+        info = []
+        info.append("+-< %-27s >" % self.name)
+        info.append("| \\")
+        info.extend([ str(field) for field in self.get_fields() ])
+        info.append("\\-< %-27s >\tcontains %d fields" % (self.name, len(self._fields)))
+        info.append(super(Protocol, self).__str__())
+
+        return "\n".join(info)
 
     def _is_valid(self, field):