Skip to content

Commit e653cd8

Browse files
committed
use context managers for file I/O
1 parent dac0ec5 commit e653cd8

File tree

9 files changed

+35
-178
lines changed

9 files changed

+35
-178
lines changed

complete_rebase.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

concore.egg-info/PKG-INFO

Lines changed: 0 additions & 106 deletions
This file was deleted.

concore.egg-info/SOURCES.txt

Lines changed: 0 additions & 24 deletions
This file was deleted.

concore.egg-info/dependency_links.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

concore.egg-info/entry_points.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

concore.egg-info/requires.txt

Lines changed: 0 additions & 9 deletions
This file was deleted.

concore.egg-info/top_level.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

setup_branch.ps1

Lines changed: 0 additions & 8 deletions
This file was deleted.

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 (OSError, IOError):
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 (OSError, IOError):
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 (OSError, IOError):
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 (OSError, IOError):
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 (OSError, IOError):
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 (OSError, IOError):
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 (OSError, IOError):
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 (OSError, IOError):
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 (OSError, IOError):
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 (OSError, IOError):
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 (OSError, IOError):
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 (OSError, IOError):
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 Exception:
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 Exception:
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)