Commit 60c5690

authored

Merge pull request #51 from jacobwilliams/50-quotes

always enclose filename in quotes in execute function if it isn't already

2 parents d9ded3f + da34d27 commit 60c5690Copy full SHA for 60c5690

File tree

+14

-2

lines changed

+14

-2

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1397,6 +1397,12 @@ subroutine execute(me, pyfile, istat, python)`
`1397`	`1397`	`file = trim(pyfile) !use the user-specified name`
`1398`	`1398`	`end if`
`1399`	`1399`
	`1400`	`+ if (file == '') then`
	`1401`	`+ if (present(istat)) istat = -1`
	`1402`	`+ write(error_unit,'(A)') 'Error: filename is blank.'`
	`1403`	`+ return`
	`1404`	`+ end if`
	`1405`	`+`
`1400`	`1406`	`!open the file:`
`1401`	`1407`	`open(newunit=iunit, file=file, status='REPLACE', iostat=iostat)`
`1402`	`1408`	`if (iostat/=0) then`
`@@ -1423,8 +1429,8 @@ subroutine execute(me, pyfile, istat, python)`
`1423`	`1429`	`end if`
`1424`	`1430`
`1425`	`1431`	`!run the file using python:`
`1426`		`- if (index(file,'')>0) then`
`1427`		`- ! space in path, probably should enclose in quotes`
	`1432`	`+ if (file(1:1)/='"') then`
	`1433`	`+ ! if not already in quotes, should enclose in quotes`
`1428`	`1434`	`call execute_command_line(python_//' "'//file//'"')`
`1429`	`1435`	`else`
`1430`	`1436`	`call execute_command_line(python_//' '//file)`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -201,5 +201,11 @@ program test`
`201`	`201`	`dpi='200', &`
`202`	`202`	`transparent=.true.,istat=istat, python='python')`
`203`	`203`
	`204`	`+ ! also test one with spaces and () in the filename`
	`205`	`+ call plt%savefig(testdir//'error bar (1).png', &`
	`206`	`+ pyfile=testdir//'error bar (1).py', &`
	`207`	`+ dpi='200', &`
	`208`	`+ transparent=.true.,istat=istat, python='python')`
	`209`	`+`
`204`	`210`	`end program test`
`205`	`211`	`!*****************************************************************************************`

Comments

(0)