Skip to content

Commit 8532886

Browse files
dbastondbaston
committed
autotest: use gdaltest.vsi_open
1 parent 89c407a commit 8532886

1 file changed

Lines changed: 60 additions & 99 deletions

File tree

‎autotest/ogr/ogr_libkml.py‎

Lines changed: 60 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -707,10 +707,8 @@ def test_ogr_libkml_camera(tmp_vsimem):
707707

708708
ds = None
709709

710-
f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_camera.kml", "rb")
711-
data = gdal.VSIFReadL(1, 2048, f)
712-
data = data.decode("ascii")
713-
gdal.VSIFCloseL(f)
710+
with gdaltest.vsi_open(tmp_vsimem / "ogr_libkml_camera.kml", "rb") as f:
711+
data = f.read().decode("ascii")
714712

715713
assert not (
716714
data.find("<Camera>") == -1
@@ -771,10 +769,8 @@ def test_ogr_libkml_write_layer_lookat(tmp_vsimem):
771769
ds.CreateLayer("test2", options=options)
772770
ds = None
773771

774-
f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_write_layer_lookat.kml", "rb")
775-
data = gdal.VSIFReadL(1, 2048, f)
776-
data = data.decode("ascii")
777-
gdal.VSIFCloseL(f)
772+
with gdaltest.vsi_open(tmp_vsimem / "ogr_libkml_write_layer_lookat.kml", "rb") as f:
773+
data = f.read().decode("ascii")
778774

779775
assert not (
780776
data.find("<LookAt>") == -1
@@ -816,10 +812,8 @@ def test_ogr_libkml_write_layer_camera(tmp_vsimem):
816812
ds.CreateLayer("test", options=options)
817813
ds = None
818814

819-
f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_write_layer_camera.kml", "rb")
820-
data = gdal.VSIFReadL(1, 2048, f)
821-
data = data.decode("ascii")
822-
gdal.VSIFCloseL(f)
815+
with gdaltest.vsi_open(tmp_vsimem / "ogr_libkml_write_layer_camera.kml", "rb") as f:
816+
data = f.read().decode("ascii")
823817

824818
assert not (
825819
data.find("<Camera>") == -1
@@ -884,10 +878,8 @@ def test_ogr_libkml_write_snippet(tmp_vsimem):
884878
lyr.CreateFeature(feat)
885879
ds = None
886880

887-
f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_write_snippet.kml", "rb")
888-
data = gdal.VSIFReadL(1, 2048, f)
889-
data = data.decode("ascii")
890-
gdal.VSIFCloseL(f)
881+
with gdaltest.vsi_open(tmp_vsimem / "ogr_libkml_write_snippet.kml", "rb") as f:
882+
data = f.read().decode("ascii")
891883

892884
assert data.find("<snippet>test_snippet</snippet>") != -1
893885

@@ -920,10 +912,8 @@ def test_ogr_libkml_write_atom_author(tmp_vsimem):
920912
assert ds is not None, "Unable to create %s." % filepath
921913
ds = None
922914

923-
f = gdal.VSIFOpenL(filepath, "rb")
924-
data = gdal.VSIFReadL(1, 2048, f)
925-
data = data.decode("ascii")
926-
gdal.VSIFCloseL(f)
915+
with gdaltest.vsi_open(filepath, "rb") as f:
916+
data = f.read().decode("ascii")
927917

928918
assert not (
929919
data.find(
@@ -949,10 +939,8 @@ def test_ogr_libkml_write_atom_link(tmp_vsimem):
949939
assert ds is not None, "Unable to create %s." % filepath
950940
ds = None
951941

952-
f = gdal.VSIFOpenL(filepath, "rb")
953-
data = gdal.VSIFReadL(1, 2048, f)
954-
data = data.decode("ascii")
955-
gdal.VSIFCloseL(f)
942+
with gdaltest.vsi_open(filepath, "rb") as f:
943+
data = f.read().decode("ascii")
956944

957945
assert not (
958946
data.find(
@@ -976,10 +964,8 @@ def test_ogr_libkml_write_phonenumber(tmp_vsimem):
976964
assert ds is not None, "Unable to create %s." % filepath
977965
ds = None
978966

979-
f = gdal.VSIFOpenL(filepath, "rb")
980-
data = gdal.VSIFReadL(1, 2048, f)
981-
data = data.decode("ascii")
982-
gdal.VSIFCloseL(f)
967+
with gdaltest.vsi_open(filepath, "rb") as f:
968+
data = f.read().decode("ascii")
983969

984970
assert data.find("<phoneNumber>tel:911</phoneNumber>") != -1
985971

@@ -1013,10 +999,8 @@ def test_ogr_libkml_write_region(tmp_vsimem):
1013999
)
10141000
ds = None
10151001

1016-
f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_write_region.kml", "rb")
1017-
data = gdal.VSIFReadL(1, 2048, f)
1018-
data = data.decode("ascii")
1019-
gdal.VSIFCloseL(f)
1002+
with gdaltest.vsi_open(tmp_vsimem / "ogr_libkml_write_region.kml", "rb") as f:
1003+
data = f.read().decode("ascii")
10201004

10211005
assert not (
10221006
data.find("<north>49</north>") == -1
@@ -1071,10 +1055,10 @@ def test_ogr_libkml_write_screenoverlay(tmp_vsimem):
10711055
)
10721056
ds = None
10731057

1074-
f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_write_screenoverlay.kml", "rb")
1075-
data = gdal.VSIFReadL(1, 2048, f)
1076-
data = data.decode("ascii")
1077-
gdal.VSIFCloseL(f)
1058+
with gdaltest.vsi_open(
1059+
tmp_vsimem / "ogr_libkml_write_screenoverlay.kml", "rb"
1060+
) as f:
1061+
data = f.read().decode("ascii")
10781062

10791063
assert not (
10801064
data.find("<href>http://foo</href>") == -1
@@ -1135,10 +1119,8 @@ def test_ogr_libkml_write_model(tmp_vsimem):
11351119

11361120
ds = None
11371121

1138-
f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_write_model.kml", "rb")
1139-
data = gdal.VSIFReadL(1, 2048, f)
1140-
data = data.decode("ascii")
1141-
gdal.VSIFCloseL(f)
1122+
with gdaltest.vsi_open(tmp_vsimem / "ogr_libkml_write_model.kml", "rb") as f:
1123+
data = f.read().decode("ascii")
11421124

11431125
assert not (
11441126
data.find("<longitude>2</longitude>") == -1
@@ -1274,10 +1256,10 @@ def test_ogr_libkml_read_write_style(tmp_vsimem):
12741256
ds = None
12751257
src_ds = None
12761258

1277-
f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_read_write_style_write.kml", "rb")
1278-
data = gdal.VSIFReadL(1, 2048, f)
1279-
data = data.decode("ascii")
1280-
gdal.VSIFCloseL(f)
1259+
with gdaltest.vsi_open(
1260+
tmp_vsimem / "ogr_libkml_read_write_style_write.kml", "rb"
1261+
) as f:
1262+
data = f.read().decode("ascii")
12811263
lines = [l.strip() for l in data.split("\n")]
12821264

12831265
lines_got = lines[
@@ -1308,10 +1290,10 @@ def test_ogr_libkml_read_write_style(tmp_vsimem):
13081290
ds = None
13091291
src_ds = None
13101292

1311-
f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_read_write_style_write.kml", "rb")
1312-
data = gdal.VSIFReadL(1, 2048, f)
1313-
data = data.decode("ascii")
1314-
gdal.VSIFCloseL(f)
1293+
with gdaltest.vsi_open(
1294+
tmp_vsimem / "ogr_libkml_read_write_style_write.kml", "rb"
1295+
) as f:
1296+
data = f.read().decode("ascii")
13151297
lines = [l.strip() for l in data.split("\n")]
13161298

13171299
lines_got = lines[
@@ -1346,10 +1328,10 @@ def test_ogr_libkml_read_write_style(tmp_vsimem):
13461328
assert feat.GetStyleString() == style_string
13471329
ds = None
13481330

1349-
f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_read_write_style_write.kml", "rb")
1350-
data = gdal.VSIFReadL(1, 2048, f)
1351-
data = data.decode("ascii")
1352-
gdal.VSIFCloseL(f)
1331+
with gdaltest.vsi_open(
1332+
tmp_vsimem / "ogr_libkml_read_write_style_write.kml", "rb"
1333+
) as f:
1334+
data = f.read().decode("ascii")
13531335

13541336
expected_style = """<Style>
13551337
<IconStyle>
@@ -1394,11 +1376,10 @@ def test_ogr_libkml_read_write_style(tmp_vsimem):
13941376
ds.SetStyleTable(style_table)
13951377
ds = None
13961378

1397-
f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_read_write_style_write.kml", "rb")
1398-
data = gdal.VSIFReadL(1, 2048, f)
1399-
data = data.decode("ascii")
1400-
gdal.VSIFCloseL(f)
1401-
lines = [l.strip() for l in data.split("\n")]
1379+
with gdaltest.vsi_open(
1380+
tmp_vsimem / "ogr_libkml_read_write_style_write.kml", "r"
1381+
) as f:
1382+
lines = [l.strip() for l in f]
14021383

14031384
expected_styles = """<Style id="style1_normal">
14041385
<IconStyle>
@@ -1470,11 +1451,8 @@ def test_ogr_libkml_write_update(tmp_vsimem, fmt):
14701451
else:
14711452
open_name = name
14721453

1473-
f = gdal.VSIFOpenL(open_name, "rb")
1474-
assert f is not None, "Unable to open the write_update file."
1475-
data = gdal.VSIFReadL(1, 2048, f)
1476-
data = data.decode("ascii")
1477-
gdal.VSIFCloseL(f)
1454+
with gdaltest.vsi_open(open_name, "rb") as f:
1455+
data = f.read().decode("ascii")
14781456

14791457
assert not (
14801458
data.find("<NetworkLinkControl>") == -1
@@ -1525,11 +1503,8 @@ def test_ogr_libkml_write_networklinkcontrol(tmp_vsimem, fmt):
15251503
else:
15261504
open_name = name
15271505

1528-
f = gdal.VSIFOpenL(open_name, "rb")
1529-
assert f is not None
1530-
data = gdal.VSIFReadL(1, 2048, f)
1531-
data = data.decode("ascii")
1532-
gdal.VSIFCloseL(f)
1506+
with gdaltest.vsi_open(open_name, "rb") as f:
1507+
data = f.read().decode("ascii")
15331508

15341509
assert not (
15351510
data.find("<minRefreshPeriod>3600</minRefreshPeriod>") == -1
@@ -1564,10 +1539,8 @@ def test_ogr_libkml_write_liststyle(tmp_vsimem):
15641539
ds.CreateLayer("test_error", options=["LISTSTYLE_TYPE=error"])
15651540
ds = None
15661541

1567-
f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_write_liststyle.kml", "rb")
1568-
data = gdal.VSIFReadL(1, 2048, f)
1569-
data = data.decode("ascii")
1570-
gdal.VSIFCloseL(f)
1542+
with gdaltest.vsi_open(tmp_vsimem / "ogr_libkml_write_liststyle.kml", "rb") as f:
1543+
data = f.read().decode("ascii")
15711544

15721545
assert not (
15731546
data.find("<styleUrl>#root_doc_liststyle</styleUrl>") == -1
@@ -1637,10 +1610,8 @@ def test_ogr_libkml_write_networklink(tmp_vsimem):
16371610

16381611
ds = None
16391612

1640-
f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_write_networklink.kml", "rb")
1641-
data = gdal.VSIFReadL(1, 2048, f)
1642-
data = data.decode("ascii")
1643-
gdal.VSIFCloseL(f)
1613+
with gdaltest.vsi_open(tmp_vsimem / "ogr_libkml_write_networklink.kml", "rb") as f:
1614+
data = f.read().decode("ascii")
16441615

16451616
assert not (
16461617
data.find("<name>a network link</name>") == -1
@@ -1723,10 +1694,8 @@ def test_ogr_libkml_write_photooverlay(tmp_vsimem):
17231694

17241695
ds = None
17251696

1726-
f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_write_photooverlay.kml", "rb")
1727-
data = gdal.VSIFReadL(1, 2048, f)
1728-
data = data.decode("ascii")
1729-
gdal.VSIFCloseL(f)
1697+
with gdaltest.vsi_open(tmp_vsimem / "ogr_libkml_write_photooverlay.kml", "rb") as f:
1698+
data = f.read().decode("ascii")
17301699

17311700
assert not (
17321701
data.find("<Camera>") == -1
@@ -1774,10 +1743,8 @@ def test_ogr_libkml_read_write_data(tmp_vsimem):
17741743
lyr.CreateFeature(feat)
17751744
ds = None
17761745

1777-
f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_read_write_data.kml", "rb")
1778-
data = gdal.VSIFReadL(1, 2048, f)
1779-
data = data.decode("ascii")
1780-
gdal.VSIFCloseL(f)
1746+
with gdaltest.vsi_open(tmp_vsimem / "ogr_libkml_read_write_data.kml", "rb") as f:
1747+
data = f.read().decode("ascii")
17811748

17821749
assert not (
17831750
data.find('<Data name="foo">') == -1 or data.find("<value>bar</value>") == -1
@@ -1802,10 +1769,8 @@ def test_ogr_libkml_write_folder(tmp_vsimem):
18021769
ds.CreateLayer("test2", options=["FOLDER=YES"])
18031770
ds = None
18041771

1805-
f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_write_folder.kml", "rb")
1806-
data = gdal.VSIFReadL(1, 2048, f)
1807-
data = data.decode("ascii")
1808-
gdal.VSIFCloseL(f)
1772+
with gdaltest.vsi_open(tmp_vsimem / "ogr_libkml_write_folder.kml", "rb") as f:
1773+
data = f.read().decode("ascii")
18091774

18101775
assert not (
18111776
data.find('<Style id="test_liststyle">') == -1
@@ -1844,10 +1809,10 @@ def test_ogr_libkml_write_container_properties(tmp_vsimem):
18441809
)
18451810
ds = None
18461811

1847-
f = gdal.VSIFOpenL(tmp_vsimem / "ogr_libkml_write_container_properties.kml", "rb")
1848-
data = gdal.VSIFReadL(1, 2048, f)
1849-
data = data.decode("ascii")
1850-
gdal.VSIFCloseL(f)
1812+
with gdaltest.vsi_open(
1813+
tmp_vsimem / "ogr_libkml_write_container_properties.kml", "rb"
1814+
) as f:
1815+
data = f.read().decode("ascii")
18511816

18521817
assert not (
18531818
data.find("<name>ds_name</name>") == -1
@@ -2082,14 +2047,10 @@ def test_ogr_libkml_write_layer_name_underscore(tmp_vsimem):
20822047
ds.CreateLayer("_45+6")
20832048
ds = None
20842049

2085-
f = gdal.VSIFOpenL(dirname + "/123.kml", "rb")
2086-
assert f
2087-
content = gdal.VSIFReadL(1, 10000, f)
2088-
gdal.VSIFCloseL(f)
2050+
with gdaltest.vsi_open(dirname + "/123.kml", "rb") as f:
2051+
content = f.read()
20892052
assert b'<Document id="_123">' in content
20902053

2091-
f = gdal.VSIFOpenL(dirname + "/_45+6.kml", "rb")
2092-
assert f
2093-
content = gdal.VSIFReadL(1, 10000, f)
2094-
gdal.VSIFCloseL(f)
2054+
with gdaltest.vsi_open(dirname + "/_45+6.kml", "rb") as f:
2055+
content = f.read()
20952056
assert b'<Document id="_45_6">' in content

0 commit comments

Comments
 (0)