Skip to content

Commit 55924fa

Browse files
committed
Remove gratuitous (and dangerous) eval
Undoes changes made in 98af1a6. If not careful, `futurize` converts `raw_input()` into `input()`, and then into `eval(input())`, which is VeryBad\TM. See PythonCharmers/python-future#427
1 parent 92e7551 commit 55924fa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+88
-88
lines changed

_setup/copy_script.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ def finalize_options(self):
3838
ans = "junk"
3939

4040
while (len(ans) > 0) and ("yes".find(ans.lower()) is not 0) and ("no".find(ans.lower()) is not 0):
41-
ans = eval(input("The file '%s' already exists. Overwrite? [n] "%self.To))
41+
ans = input("The file '%s' already exists. Overwrite? [n] "%self.To)
4242

4343
if ans is '':
4444
ans = 'no'
4545

4646
if ("no".find(ans.lower()) is 0):
47-
self.To = eval(input("Please give a name for the ouput file: "))
47+
self.To = input("Please give a name for the ouput file: ")
4848
self.finalize_options()
4949

5050
def run(self):

examples/cahnHilliard/mesh2D.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,5 +116,5 @@
116116
import fipy.tests.doctestPlus
117117
exec(fipy.tests.doctestPlus._getScript())
118118

119-
eval(input('finished'))
119+
input('finished')
120120

examples/cahnHilliard/mesh2DCoupled.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,4 +178,4 @@
178178
import fipy.tests.doctestPlus
179179
exec(fipy.tests.doctestPlus._getScript())
180180

181-
eval(input('finished'))
181+
input('finished')

examples/cahnHilliard/mesh3D.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@
8282
import fipy.tests.doctestPlus
8383
exec(fipy.tests.doctestPlus._getScript())
8484

85-
eval(input('finished'))
85+
input('finished')

examples/cahnHilliard/sphere.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,5 +117,5 @@
117117
import fipy.tests.doctestPlus
118118
exec(fipy.tests.doctestPlus._getScript())
119119

120-
eval(input('finished'))
120+
input('finished')
121121

examples/cahnHilliard/tanh1D.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,4 +160,4 @@
160160
import fipy.tests.doctestPlus
161161
exec(fipy.tests.doctestPlus._getScript())
162162

163-
eval(input('finished'))
163+
input('finished')

examples/chemotaxis/input.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,4 +113,4 @@
113113

114114
KMViewer.plot()
115115

116-
eval(input("finished"))
116+
input("finished")

examples/chemotaxis/input2D.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,4 @@
117117
KMViewer.plot()
118118
TMViewer.plot()
119119

120-
eval(input("finished"))
120+
input("finished")

examples/convection/advection/explicitUpwind.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@
4444
solver = LinearLUSolver(tolerance=1.e-15, iterations=2000))
4545
viewer.plot()
4646
viewer.plot()
47-
eval(input('finished'))
47+
input('finished')

examples/convection/advection/implicitUpwind.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939

4040
viewer = Viewer(vars=(var,))
4141
viewer.plot()
42-
eval(input("press key to continue"))
42+
input("press key to continue")
4343
for step in range(steps):
4444
eq.solve(var,
4545
dt = timeStepDuration,
4646
solver = LinearLUSolver(tolerance = 1.e-15))
4747
viewer.plot()
4848
viewer.plot()
49-
eval(input('finished'))
49+
input('finished')

examples/convection/advection/vanLeerUpwind.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,4 @@
8888

8989
print('maximum absolute difference between periodic and non-periodic grids:', abs(var1[nx // 4:(3 * nx) // 4] - newVar2).max())
9090

91-
eval(input('finished'))
91+
input('finished')

examples/convection/exponential1D/cylindricalMesh1D.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,5 +102,5 @@
102102
import fipy.tests.doctestPlus
103103
exec(fipy.tests.doctestPlus._getScript())
104104

105-
eval(input('finished'))
105+
input('finished')
106106

examples/convection/exponential1D/cylindricalMesh1DNonUniform.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,5 +105,5 @@
105105
import fipy.tests.doctestPlus
106106
exec(fipy.tests.doctestPlus._getScript())
107107

108-
eval(input('finished'))
108+
input('finished')
109109

examples/convection/exponential1D/mesh1D.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,5 +100,5 @@
100100
import fipy.tests.doctestPlus
101101
exec(fipy.tests.doctestPlus._getScript())
102102

103-
eval(input('finished'))
103+
input('finished')
104104

examples/convection/exponential1D/tri2D.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@
6060
import fipy.tests.doctestPlus
6161
exec(fipy.tests.doctestPlus._getScript())
6262

63-
eval(input('finished'))
63+
input('finished')
6464

examples/convection/exponential1DBack/mesh1D.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,5 @@
5252
import fipy.tests.doctestPlus
5353
exec(fipy.tests.doctestPlus._getScript())
5454

55-
eval(input('finished'))
55+
input('finished')
5656

examples/convection/exponential1DSource/mesh1D.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,5 @@
9595
import fipy.tests.doctestPlus
9696
exec(fipy.tests.doctestPlus._getScript())
9797

98-
eval(input('finished'))
98+
input('finished')
9999

examples/convection/exponential1DSource/tri2D.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,5 @@
6666
import fipy.tests.doctestPlus
6767
exec(fipy.tests.doctestPlus._getScript())
6868

69-
eval(input('finished'))
69+
input('finished')
7070

examples/convection/exponential2D/cylindricalMesh2D.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,6 @@
104104
import fipy.tests.doctestPlus
105105
exec(fipy.tests.doctestPlus._getScript())
106106

107-
eval(input('finished'))
107+
input('finished')
108108

109109

examples/convection/exponential2D/cylindricalMesh2DNonUniform.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,6 @@
102102
import fipy.tests.doctestPlus
103103
exec(fipy.tests.doctestPlus._getScript())
104104

105-
eval(input('finished'))
105+
input('finished')
106106

107107

examples/convection/exponential2D/mesh2D.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@
5353
import fipy.tests.doctestPlus
5454
exec(fipy.tests.doctestPlus._getScript())
5555

56-
eval(input('finished'))
56+
input('finished')
5757

5858

examples/convection/exponential2D/tri2D.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@
5151
import fipy.tests.doctestPlus
5252
exec(fipy.tests.doctestPlus._getScript())
5353

54-
eval(input('finished'))
54+
input('finished')
5555

5656

examples/convection/powerLaw1D/mesh1D.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@
5555
import fipy.tests.doctestPlus
5656
exec(fipy.tests.doctestPlus._getScript())
5757

58-
eval(input('finished'))
58+
input('finished')
5959

examples/convection/powerLaw1D/tri2D.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@
5252
import fipy.tests.doctestPlus
5353
exec(fipy.tests.doctestPlus._getScript())
5454

55-
eval(input('finished'))
55+
input('finished')
5656

5757

examples/convection/robin.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,5 +102,5 @@
102102
import fipy.tests.doctestPlus
103103
exec(fipy.tests.doctestPlus._getScript())
104104

105-
eval(input('finished'))
105+
input('finished')
106106

examples/diffusion/anisotropy.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,4 @@
106106
import fipy.tests.doctestPlus
107107
exec(fipy.tests.doctestPlus._getScript())
108108

109-
eval(input('finished'))
109+
input('finished')

examples/diffusion/coupled.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,4 @@
123123
import fipy.tests.doctestPlus
124124
exec(fipy.tests.doctestPlus._getScript())
125125

126-
eval(input('finished'))
126+
input('finished')

examples/diffusion/electrostatics.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,4 @@
182182
import fipy.tests.doctestPlus
183183
exec(fipy.tests.doctestPlus._getScript())
184184

185-
eval(input("finished"))
185+
input("finished")

examples/diffusion/explicit/mesh1D.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,4 @@
8181
if __name__ == '__main__':
8282
import fipy.tests.doctestPlus
8383
exec(fipy.tests.doctestPlus._getScript())
84-
eval(input('finished'))
84+
input('finished')

examples/diffusion/explicit/tri2D.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,4 @@
7979
print(var)
8080
viewer = Viewer(vars = var)
8181
viewer.plot()
82-
eval(input('finished'))
82+
input('finished')

examples/diffusion/nthOrder/input4thOrder-line.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@
4646
viewer.plot()
4747

4848
print(var.allclose(mesh.cellCenters[0], atol = 10))
49-
eval(input("finished"))
49+
input("finished")
5050

examples/diffusion/nthOrder/input4thOrder1D.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,5 +100,5 @@
100100
if __name__ == '__main__':
101101
import fipy.tests.doctestPlus
102102
exec(fipy.tests.doctestPlus._getScript())
103-
eval(input('finished'))
103+
input('finished')
104104

examples/diffusion/steadyState/mesh1D/inputPeriodic.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@
5252
if __name__ == '__main__':
5353
import fipy.tests.doctestPlus
5454
exec(fipy.tests.doctestPlus._getScript())
55-
eval(input("finished"))
55+
input("finished")

examples/diffusion/steadyState/mesh1D/tri2Dinput.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,5 @@
6161
Lx = nx * dx
6262
analyticalArray = valueLeft + (valueRight - valueLeft) * x / Lx
6363
print(var.allclose(analyticalArray))
64-
eval(input("finished"))
64+
input("finished")
6565

examples/diffusion/steadyState/mesh20x20/gmshinput.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@
5252
viewer.plot()
5353
NOViewer.plot()
5454

55-
eval(input("finished"))
55+
input("finished")

examples/diffusion/steadyState/mesh20x20/isotropy.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@
3939
import fipy.tests.doctestPlus
4040
exec(fipy.tests.doctestPlus._getScript())
4141

42-
eval(input('finished'))
42+
input('finished')
4343

examples/diffusion/steadyState/mesh20x20/tri2Dinput.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@
3939
DiffusionTerm().solve(var)
4040
viewer = Viewer(vars = var)
4141
viewer.plot()
42-
eval(input("finished"))
42+
input("finished")
4343

examples/diffusion/steadyState/mesh50x50/input.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@
4545

4646
viewer = Viewer(vars=var, datamin=0., datamax=1.)
4747
viewer.plot()
48-
eval(input("finished"))
48+
input("finished")
4949

examples/diffusion/steadyState/mesh50x50/tri2Dinput.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@
4646
DiffusionTerm().solve(var)
4747
viewer = Viewer(vars = var)
4848
viewer.plot()
49-
eval(input("finished"))
49+
input("finished")
5050

examples/diffusion/steadyState/otherMeshes/cubicalProblem.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@
5757
##viewer7.plot(resolution = 0.2, xlabel = "X values (Z value = 7)", minval = valueFront, maxval = valueBack)
5858
##raw_input("press enter to continue")
5959
##viewer9.plot(resolution = 0.2, xlabel = "X values (Z value = 9)", minval = valueFront, maxval = valueBack)
60-
eval(input("finished"))
60+
input("finished")

examples/diffusion/steadyState/otherMeshes/grid3Dinput.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,5 @@
6666
eqn.solve(var2)
6767
viewer = Viewer(var2)
6868
viewer.plot()
69-
eval(input("finished"))
69+
input("finished")
7070

examples/diffusion/variable.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,5 @@
5454
if __name__ == '__main__':
5555
import fipy.tests.doctestPlus
5656
exec(fipy.tests.doctestPlus._getScript())
57-
eval(input('finished'))
57+
input('finished')
5858

examples/elphf/diffusion/mesh1D.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,4 +136,4 @@
136136

137137
# profile.stop()
138138

139-
eval(input("finished"))
139+
input("finished")

examples/elphf/diffusion/mesh1Ddimensional.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,4 +136,4 @@
136136

137137
# profile.stop()
138138

139-
eval(input("finished"))
139+
input("finished")

examples/elphf/diffusion/mesh2D.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,4 +171,4 @@
171171

172172
# profile.stop()
173173

174-
eval(input("finished"))
174+
input("finished")

examples/elphf/input.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -357,4 +357,4 @@
357357

358358
# profile.stop()
359359

360-
eval(input("finished"))
360+
input("finished")

examples/elphf/phase.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,4 +181,4 @@
181181

182182
## profile.stop()
183183

184-
eval(input("finished"))
184+
input("finished")

examples/elphf/phaseDiffusion.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@
386386
if __name__ == "__main__":
387387
import fipy.tests.doctestPlus
388388
exec(fipy.tests.doctestPlus._getScript())
389-
eval(input("finished"))
389+
input("finished")
390390

391391
## if __name__ == '__main__':
392392
## ## from fipy.tools.profiler.profiler import Profiler

examples/elphf/poisson.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,4 +191,4 @@
191191
import fipy.tests.doctestPlus
192192
exec(fipy.tests.doctestPlus._getScript())
193193

194-
eval(input("finished"))
194+
input("finished")

examples/flow/stokesCavity.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -310,4 +310,4 @@
310310
if __name__ == '__main__':
311311
import fipy.tests.doctestPlus
312312
exec(fipy.tests.doctestPlus._getScript(__name__))
313-
eval(input('finished'))
313+
input('finished')

examples/levelSet/advection/circle.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,4 @@
101101
if __name__ == '__main__':
102102
import fipy.tests.doctestPlus
103103
exec(fipy.tests.doctestPlus._getScript())
104-
eval(input("finished"))
104+
input("finished")

examples/levelSet/advection/mesh1D.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@
8282
if __name__ == '__main__':
8383
import fipy.tests.doctestPlus
8484
exec(fipy.tests.doctestPlus._getScript())
85-
eval(input("finished"))
85+
input("finished")

examples/levelSet/advection/trench.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,4 @@
8181
if __name__ == '__main__':
8282
import fipy.tests.doctestPlus
8383
exec(fipy.tests.doctestPlus._getScript())
84-
eval(input('finished'))
84+
input('finished')

examples/levelSet/distanceFunction/circle.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,6 @@
8787
if __name__ == '__main__':
8888
import fipy.tests.doctestPlus
8989
exec(fipy.tests.doctestPlus._getScript())
90-
eval(input("finished"))
90+
input("finished")
9191

9292

examples/levelSet/distanceFunction/interior.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@
6767
var.calcDistanceFunction(order=1)
6868
viewer = Viewer(vars=var, datamin=-5., datamax=5.)
6969
viewer.plot()
70-
eval(input('finished'))
70+
input('finished')
7171

7272

examples/levelSet/distanceFunction/mesh1D.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,5 @@
6262
if __name__ == '__main__':
6363
import fipy.tests.doctestPlus
6464
exec(fipy.tests.doctestPlus._getScript())
65-
eval(input("finished"))
65+
input("finished")
6666

examples/levelSet/distanceFunction/square.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,6 @@
6969
var.calcDistanceFunction(order=1)
7070
viewer = Viewer(vars=var, maxval=-5., minval=5.)
7171
viewer.plot()
72-
eval(input('finished'))
72+
input('finished')
7373

7474

0 commit comments

Comments
 (0)