Changeset 3933

Timestamp:

01/11/09 17:41:13 (4 years ago)

Author:

nopper

Message:

Forget to remove qnames

Location:

branch/PacketManipulator

Files:

• PM/Backend/Scapy/serialize.py (modified) (3 diffs)
• PM/Manager/PreferenceManager.py (modified) (1 diff)
• PacketManipulator (modified) (1 diff)

branch/PacketManipulator/PM/Backend/Scapy/serialize.py

@@ -215 +215 @@
         filter = seq_packet.filter
 
-        attr_vals = {(None, u'interval') : str(inter),
-                     (None, u'filter') : filter or ''}
+        attr_vals = {'interval' : str(inter),
+                     'filter' : filter or ''}
 
         attrs = AttributesImpl(attr_vals)
@@ -231 +231 @@
 
         for proto in protocols:
-            attr_vals = {(None, u'id') : get_proto_name(proto),
-                         (None, u'time') : "%.6f" % proto.time}
+            attr_vals = {'id' : get_proto_name(proto),
+                         'time' : "%.6f" % proto.time}
 
             attrs = AttributesImpl(attr_vals)
@@ -242 +242 @@
                 value = get_field_value(proto, field)
 
-                attr_vals = {(None, u'id') : name}
+                attr_vals = {'id' : name}
 
                 self.writer.characters('\n')

branch/PacketManipulator/PM/Manager/PreferenceManager.py

@@ -160 +160 @@
 
             attr_vals = {
-                (None, u'id') : key,
-                (None, u'value') : str(option.value)
+                'id' : key,
+                'value' : str(option.value)
             }
 

branch/PacketManipulator/PacketManipulator

@@ -27 +27 @@
 if os.name == 'nt':
     os.chdir('PM')
-    os.system('python PacketManipulator')
+    os.system('python -3 PacketManipulator')
 else:
     os.system('PM/PacketManipulator')