Skip to content

Commit 7cd52e6

Browse files
committed
Refactor file I/O to use context managers and fix bare excepts
1 parent 07d8b19 commit 7cd52e6

3 files changed

Lines changed: 754 additions & 757 deletions

File tree

concore.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ def convert_numpy_to_python(obj):
3232

3333
try:
3434
iport = literal_eval(open("concore.iport").read())
35-
except:
35+
except (FileNotFoundError, IOError):
3636
iport = dict()
3737
try:
3838
oport = literal_eval(open("concore.oport").read())
39-
except:
39+
except (FileNotFoundError, IOError):
4040
oport = dict()
4141

4242

@@ -53,7 +53,7 @@ def default_maxtime(default):
5353
global maxtime
5454
try:
5555
maxtime = literal_eval(open(inpath+"1/concore.maxtime").read())
56-
except:
56+
except (FileNotFoundError, IOError):
5757
maxtime = default
5858
default_maxtime(100)
5959

@@ -70,9 +70,9 @@ def read(port, name, initstr):
7070
global s,simtime,retrycount
7171
time.sleep(delay)
7272
try:
73-
infile = open(inpath+str(port)+"/"+name);
73+
infile = open(inpath+str(port)+"/"+name)
7474
ins = infile.read()
75-
except:
75+
except (FileNotFoundError, IOError):
7676
ins = initstr
7777
while len(ins)==0:
7878
time.sleep(delay)
@@ -99,7 +99,7 @@ def write(port, name, val, delta=0):
9999
simtime += delta
100100
else:
101101
outfile.write(val)
102-
except:
102+
except IOError:
103103
print("skipping"+outpath+str(port)+"/"+name);
104104

105105
def initval(simtime_val):

concoredocker.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
try:
55
iport = literal_eval(open("concore.iport").read())
6-
except:
6+
except (FileNotFoundError, IOError):
77
iport = dict()
88
try:
99
oport = literal_eval(open("concore.oport").read())
10-
except:
10+
except (FileNotFoundError, IOError):
1111
oport = dict()
1212

1313

@@ -23,7 +23,7 @@ def default_maxtime(default):
2323
global maxtime
2424
try:
2525
maxtime = literal_eval(open(inpath+"1/concore.maxtime").read())
26-
except:
26+
except (FileNotFoundError, IOError):
2727
maxtime = default
2828
default_maxtime(100)
2929

@@ -40,9 +40,9 @@ def read(port, name, initstr):
4040
global s,simtime,retrycount
4141
time.sleep(delay)
4242
try:
43-
infile = open(inpath+str(port)+"/"+name);
43+
infile = open(inpath+str(port)+"/"+name)
4444
ins = infile.read()
45-
except:
45+
except (FileNotFoundError, IOError):
4646
ins = initstr
4747
while len(ins)==0:
4848
time.sleep(delay)
@@ -67,7 +67,7 @@ def write(port, name, val, delta=0):
6767
simtime += delta
6868
else:
6969
outfile.write(val)
70-
except:
70+
except IOError:
7171
print("skipping"+outpath+str(port)+"/"+name);
7272

7373
def initval(simtime_val):

0 commit comments

Comments
 (0)