Skip to content

Commit c3fe122

Browse files
avinxshKDavinxshKD
committed
use context managers for file I/O
1 parent eddb2fb commit c3fe122

3 files changed

Lines changed: 55 additions & 37 deletions

File tree

‎testsou/ccpymat.dir/concore.py‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@
1212
fpid.write("taskkill /F /PID "+str(os.getpid())+"\n")
1313

1414
try:
15-
iport = literal_eval(open("concore.iport").read())
15+
with open("concore.iport") as f:
16+
iport = literal_eval(f.read())
1617
except:
1718
iport = dict()
1819
try:
19-
oport = literal_eval(open("concore.oport").read())
20+
with open("concore.oport") as f:
21+
oport = literal_eval(f.read())
2022
except:
2123
oport = dict()
2224

@@ -42,14 +44,14 @@ def read(port, name, initstr):
4244
global s,simtime,retrycount
4345
time.sleep(delay)
4446
try:
45-
infile = open(inpath+str(port)+"/"+name);
46-
ins = infile.read()
47+
with open(inpath+str(port)+"/"+name) as infile:
48+
ins = infile.read()
49+
while len(ins)==0:
50+
time.sleep(delay)
51+
ins = infile.read()
52+
retrycount += 1
4753
except:
4854
ins = initstr
49-
while len(ins)==0:
50-
time.sleep(delay)
51-
ins = infile.read()
52-
retrycount += 1
5355
s += ins
5456
inval = literal_eval(ins)
5557
simtime = max(simtime,inval[0])

‎testsou/concore.py‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@
1212
fpid.write("taskkill /F /PID "+str(os.getpid())+"\n")
1313

1414
try:
15-
iport = literal_eval(open("concore.iport").read())
15+
with open("concore.iport") as f:
16+
iport = literal_eval(f.read())
1617
except:
1718
iport = dict()
1819
try:
19-
oport = literal_eval(open("concore.oport").read())
20+
with open("concore.oport") as f:
21+
oport = literal_eval(f.read())
2022
except:
2123
oport = dict()
2224

@@ -42,14 +44,14 @@ def read(port, name, initstr):
4244
global s,simtime,retrycount
4345
time.sleep(delay)
4446
try:
45-
infile = open(inpath+str(port)+"/"+name);
46-
ins = infile.read()
47+
with open(inpath+str(port)+"/"+name) as infile:
48+
ins = infile.read()
49+
while len(ins)==0:
50+
time.sleep(delay)
51+
ins = infile.read()
52+
retrycount += 1
4753
except:
4854
ins = initstr
49-
while len(ins)==0:
50-
time.sleep(delay)
51-
ins = infile.read()
52-
retrycount += 1
5355
s += ins
5456
inval = literal_eval(ins)
5557
simtime = max(simtime,inval[0])

‎tools/cwrap.py‎

Lines changed: 35 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,51 +11,63 @@
1111
concore.delay = 0.02
1212

1313
try:
14-
apikey=open(concore.inpath+'1/concore.apikey',newline=None).readline().rstrip()
14+
with open(concore.inpath+'1/concore.apikey',newline=None) as f:
15+
apikey=f.readline().rstrip()
1516
except:
1617
try:
1718
#perhaps this should be removed for security
18-
apikey=open('./concore.apikey',newline=None).readline().rstrip()
19+
with open('./concore.apikey',newline=None) as f:
20+
apikey=f.readline().rstrip()
1921
except:
2022
apikey = ''
2123

2224
try:
23-
yuyu=open(concore.inpath+'1/concore.yuyu',newline=None).readline().rstrip()
25+
with open(concore.inpath+'1/concore.yuyu',newline=None) as f:
26+
yuyu=f.readline().rstrip()
2427
except:
2528
try:
26-
yuyu=open('./concore.yuyu',newline=None).readline().rstrip()
29+
with open('./concore.yuyu',newline=None) as f:
30+
yuyu=f.readline().rstrip()
2731
except:
2832
yuyu = 'yuyu'
2933

3034
try:
31-
name1=open(concore.inpath+'1/concore.name1',newline=None).readline().rstrip()
35+
with open(concore.inpath+'1/concore.name1',newline=None) as f:
36+
name1=f.readline().rstrip()
3237
except:
3338
try:
34-
name1=open('./concore.name1',newline=None).readline().rstrip()
39+
with open('./concore.name1',newline=None) as f:
40+
name1=f.readline().rstrip()
3541
except:
3642
name1 = 'u'
3743

3844
try:
39-
name2=open(concore.inpath+'1/concore.name2',newline=None).readline().rstrip()
45+
with open(concore.inpath+'1/concore.name2',newline=None) as f:
46+
name2=f.readline().rstrip()
4047
except:
4148
try:
42-
name2=open('./concore.name2',newline=None).readline().rstrip()
49+
with open('./concore.name2',newline=None) as f:
50+
name2=f.readline().rstrip()
4351
except:
4452
name2 = 'ym'
4553

4654
try:
47-
init_simtime_u = open(concore.inpath+'1/concore.init1',newline=None).readline().rstrip()
55+
with open(concore.inpath+'1/concore.init1',newline=None) as f:
56+
init_simtime_u = f.readline().rstrip()
4857
except:
4958
try:
50-
init_simtime_u = open('./concore.init1',newline=None).readline().rstrip()
59+
with open('./concore.init1',newline=None) as f:
60+
init_simtime_u = f.readline().rstrip()
5161
except:
5262
init_simtime_u = "[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]"
5363

5464
try:
55-
init_simtime_ym = open(concore.inpath+'1/concore.init2',newline=None).readline().rstrip()
65+
with open(concore.inpath+'1/concore.init2',newline=None) as f:
66+
init_simtime_ym = f.readline().rstrip()
5667
except:
5768
try:
58-
init_simtime_ym = open('./concore.init2',newline=None).readline().rstrip()
69+
with open('./concore.init2',newline=None) as f:
70+
init_simtime_ym = f.readline().rstrip()
5971
except:
6072
init_simtime_ym = "[0.0, 0.0, 0.0]"
6173

@@ -82,10 +94,11 @@
8294
logging.debug("CW outer loop")
8395
while concore.unchanged():
8496
u = concore.read(1,name1,init_simtime_u)
85-
f = {'file1': open(concore.inpath+'1/'+name1, 'rb')}
86-
logging.debug(f"CW: before post u={u}")
87-
logging.debug(f'http://www.controlcore.org/pm/{yuyu}{apikey}&fetch={name2}')
88-
r = requests.post('http://www.controlcore.org/pm/'+yuyu+apikey+'&fetch='+name2, files=f,timeout=timeout_max)
97+
with open(concore.inpath+'1/'+name1, 'rb') as f1:
98+
f = {'file1': f1}
99+
logging.debug(f"CW: before post u={u}")
100+
logging.debug(f'http://www.controlcore.org/pm/{yuyu}{apikey}&fetch={name2}')
101+
r = requests.post('http://www.controlcore.org/pm/'+yuyu+apikey+'&fetch='+name2, files=f,timeout=timeout_max)
89102
if r.status_code!=200:
90103
logging.error(f"bad POST request {r.status_code}")
91104
quit()
@@ -101,11 +114,12 @@
101114
while oldt==t or len(r.content)==0:
102115
time.sleep(concore.delay)
103116
logging.debug(f"CW waiting status={r.status_code} content={r.content.decode('utf-8')} t={t}")
104-
f = {'file1': open(concore.inpath+'1/'+name1, 'rb')}
105-
try:
106-
r = requests.post('http://www.controlcore.org/pm/'+yuyu+apikey+'&fetch='+name2, files=f,timeout=timeout_max)
107-
except:
108-
logging.error("CW: bad request")
117+
with open(concore.inpath+'1/'+name1, 'rb') as f1:
118+
f = {'file1': f1}
119+
try:
120+
r = requests.post('http://www.controlcore.org/pm/'+yuyu+apikey+'&fetch='+name2, files=f,timeout=timeout_max)
121+
except:
122+
logging.error("CW: bad request")
109123
timeout_count += 1
110124
if r.status_code!=200 or time.perf_counter()-t1 > 1.1*timeout_max: #timeout_count>100:
111125
logging.error(f"timeout or bad POST request {r.status_code}")

0 commit comments

Comments
 (0)