systematic use of context managers for dealing with files instead of open()/close...

[nepi.git] / examples / omf / vod_exp / demo_plot.py

diff --git a/examples/omf/vod_exp/demo_plot.py b/examples/omf/vod_exp/demo_plot.py
index 5d16c9e..26ed22a 100644 (file)
--- a/examples/omf/vod_exp/demo_plot.py
+++ b/examples/omf/vod_exp/demo_plot.py
@@ -95,21 +95,20 @@ def nb_client(s):
 def get_broad_values(list_files, type_file):
     for s in list_files:
         nb = nb_client(s)
-        o = open(s, 'r')
-        for l in o:
-            if 'udp' in l:
-                row = l.split(':')
-                f = row[1].split(' ')
-                frame = int(f[0])
-                byte = int(row[2])
-
-                res = {}
-                res['frames'] = frame
-                res['bytes'] = byte
-                if frame < 20 :
-                    continue
-                overall_stats_broad[nb][type_file].append(res)
-        o.close() 
+        with open(s, 'r') as o:
+            for l in o:
+                if 'udp' in l:
+                    row = l.split(':')
+                    f = row[1].split(' ')
+                    frame = int(f[0])
+                    byte = int(row[2])
+
+                    res = {}
+                    res['frames'] = frame
+                    res['bytes'] = byte
+                    if frame < 20 :
+                        continue
+                    overall_stats_broad[nb][type_file].append(res)
 
 get_broad_values(stats_broad_wlan, 'wlan')
 get_broad_values(stats_broad_eth, 'eth')
@@ -146,21 +145,20 @@ for exp in data_vod_folders :
 def get_vod_values(list_files, type_file):
     for s in list_files:
         nb = nb_client(s)
-        o = open(s, 'r')
-        for l in o:
-            if 'udp' in l:
-                row = l.split(':')
-                f = row[1].split(' ')
-                frame = int(f[0])
-                byte = int(row[2])
-
-                res = {}
-                res['frames'] = frame
-                res['bytes'] = byte
-                if frame < 100 :
-                    continue
-                overall_stats_vod[nb][type_file].append(res)
-        o.close() 
+        with open(s, 'r') as o:
+            for l in o:
+                if 'udp' in l:
+                    row = l.split(':')
+                    f = row[1].split(' ')
+                    frame = int(f[0])
+                    byte = int(row[2])
+
+                    res = {}
+                    res['frames'] = frame
+                    res['bytes'] = byte
+                    if frame < 100 :
+                        continue
+                    overall_stats_vod[nb][type_file].append(res)
 
 get_vod_values(stats_vod_wlan, 'wlan')
 get_vod_values(stats_vod_eth, 'eth')