Skip to content

Commit fa14c67

Browse files
author
Ben Pierce
committed
stickler2
1 parent 709493e commit fa14c67

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

pvlib/iotools/pvgis.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -585,8 +585,8 @@ def read_pvgis_tmy(filename, pvgis_format=None, map_variables=None):
585585
------
586586
ValueError
587587
if ``pvgis_format`` is ``None`` and the file extension is neither
588-
``.csv``, ``.json``, nor ``.epw``, or if ``pvgis_format`` is provided as
589-
input but isn't in ``['csv', 'epw', 'json', 'basic']``
588+
``.csv``, ``.json``, nor ``.epw``, or if ``pvgis_format`` is provided
589+
as input but isn't in ``['csv', 'epw', 'json', 'basic']``
590590
TypeError
591591
if ``pvgis_format`` is ``None`` and ``filename`` is a buffer
592592
@@ -693,6 +693,8 @@ def get_pvgis_horizon(latitude, longitude, proxies=None, url=URL):
693693

694694
# Set the column names
695695
df.columns = ['horizon_azimuth', 'horizon_angles',
696-
'azimuth_sun_winter_solstice', 'elevation_sun_winter_solstice',
697-
'azimuth_sun_summer_solstice', 'elevation_sun_summer_solstice']
696+
'azimuth_sun_winter_solstice',
697+
'elevation_sun_winter_solstice',
698+
'azimuth_sun_summer_solstice',
699+
'elevation_sun_summer_solstice']
698700
return df

pvlib/tests/iotools/test_pvgis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
data_horizon_abq = [9.9, 13.0, 14.5, 15.7, 14.9, 15.3,
7070
15.7, 15.7, 13.0, 11.5, 11.1, 11.5,
7171
10.3, 11.5, 10.3, 9.5, 10.7, 11.8,
72-
11.8, 8.8, 8.4, 7.3, 5.7, 5.7, 4.6
72+
11.8, 8.8, 8.4, 7.3, 5.7, 5.7, 4.6,
7373
3.4, 0.8, 0.0, 0.0, 0.0, 0.0, 0.0,
7474
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
7575
0.0, 0.0, 0.0, 1.1, 1.9, 3.8, 5.0,

0 commit comments

Comments
 (0)