Skip to content

Commit 4e4bb2b

Browse files
nyalldawsonnyalldawson
authoredNov 7, 2016
Merge pull request #3728 from nyalldawson/open
Cleanup processing file handling
·
ltr-3_40final-3_0_0
2 parents 9b667d1 + 0484769 commit 4e4bb2b

Some content is hidden

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

41 files changed

+536
-585
lines changed
 

‎python/plugins/processing/algs/gdal/GdalUtils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def runGdal(commands, progress=None):
8787
fused_command,
8888
shell=True,
8989
stdout=subprocess.PIPE,
90-
stdin=open(os.devnull),
90+
stdin=subprocess.DEVNULL,
9191
stderr=subprocess.STDOUT,
9292
universal_newlines=True,
9393
).stdout

‎python/plugins/processing/algs/gdal/extractprojection.py

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,15 @@ def processAlgorithm(self, progress):
7575
crs = tmp.ExportToWkt()
7676
tmp = None
7777

78-
prj = open(outFileName + '.prj', 'wt')
79-
prj.write(crs)
80-
prj.close()
81-
82-
wld = open(outFileName + '.wld', 'wt')
83-
wld.write('%0.8f\n' % geotransform[1])
84-
wld.write('%0.8f\n' % geotransform[4])
85-
wld.write('%0.8f\n' % geotransform[2])
86-
wld.write('%0.8f\n' % geotransform[5])
87-
wld.write('%0.8f\n' % (geotransform[0] + 0.5 * geotransform[1] + 0.5
88-
* geotransform[2]))
89-
wld.write('%0.8f\n' % (geotransform[3] + 0.5 * geotransform[4] + 0.5
90-
* geotransform[5]))
91-
wld.close()
78+
with open(outFileName + '.prj', 'wt') as prj:
79+
prj.write(crs)
80+
81+
with open(outFileName + '.wld', 'wt') as wld:
82+
wld.write('%0.8f\n' % geotransform[1])
83+
wld.write('%0.8f\n' % geotransform[4])
84+
wld.write('%0.8f\n' % geotransform[2])
85+
wld.write('%0.8f\n' % geotransform[5])
86+
wld.write('%0.8f\n' % (geotransform[0] + 0.5 * geotransform[1] + 0.5
87+
* geotransform[2]))
88+
wld.write('%0.8f\n' % (geotransform[3] + 0.5 * geotransform[4] + 0.5
89+
* geotransform[5]))

0 commit comments

Comments
 (0)
Please sign in to comment.