Skip to content

Commit ea9c398

Browse files
committed
Lazify all()
1 parent 72a95b0 commit ea9c398

File tree

5 files changed

+9
-11
lines changed

5 files changed

+9
-11
lines changed

pvlib/modelchain.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1984,7 +1984,7 @@ def _irrad_for_celltemp(total_irrad, effective_irradiance):
19841984
19851985
"""
19861986
if isinstance(total_irrad, tuple):
1987-
if all(['poa_global' in df for df in total_irrad]):
1987+
if all('poa_global' in df for df in total_irrad):
19881988
return _tuple_from_dfs(total_irrad, 'poa_global')
19891989
else:
19901990
return effective_irradiance

pvlib/pvsystem.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,20 +1295,18 @@ def dc_ohms_from_percent(self):
12951295
"""
12961296

12971297
# get relevent Vmp and Imp parameters from CEC parameters
1298-
if all([elem in self.module_parameters
1299-
for elem in ['V_mp_ref', 'I_mp_ref']]):
1298+
if all(elem in self.module_parameters
1299+
for elem in ['V_mp_ref', 'I_mp_ref']):
13001300
vmp_ref = self.module_parameters['V_mp_ref']
13011301
imp_ref = self.module_parameters['I_mp_ref']
13021302

13031303
# get relevant Vmp and Imp parameters from SAPM parameters
1304-
elif all([elem in self.module_parameters
1305-
for elem in ['Vmpo', 'Impo']]):
1304+
elif all(elem in self.module_parameters for elem in ['Vmpo', 'Impo']):
13061305
vmp_ref = self.module_parameters['Vmpo']
13071306
imp_ref = self.module_parameters['Impo']
13081307

13091308
# get relevant Vmp and Imp parameters if they are PVsyst-like
1310-
elif all([elem in self.module_parameters
1311-
for elem in ['Vmpp', 'Impp']]):
1309+
elif all(elem in self.module_parameters for elem in ['Vmpp', 'Impp']):
13121310
vmp_ref = self.module_parameters['Vmpp']
13131311
imp_ref = self.module_parameters['Impp']
13141312

pvlib/tests/iotools/test_pvgis.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ def test_get_pvgis_tmy_error():
496496
@pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
497497
def test_get_pvgis_map_variables(pvgis_tmy_mapped_columns):
498498
actual, _, _, _ = get_pvgis_tmy(45, 8, map_variables=True)
499-
assert all([c in pvgis_tmy_mapped_columns for c in actual.columns])
499+
assert all(c in pvgis_tmy_mapped_columns for c in actual.columns)
500500

501501

502502
@pytest.mark.remote_data
@@ -519,7 +519,7 @@ def test_read_pvgis_horizon_invalid_coords():
519519
def test_read_pvgis_tmy_map_variables(pvgis_tmy_mapped_columns):
520520
fn = DATA_DIR / 'tmy_45.000_8.000_2005_2016.json'
521521
actual, _, _, _ = read_pvgis_tmy(fn, map_variables=True)
522-
assert all([c in pvgis_tmy_mapped_columns for c in actual.columns])
522+
assert all(c in pvgis_tmy_mapped_columns for c in actual.columns)
523523

524524

525525
def test_read_pvgis_tmy_json(expected, month_year_expected, inputs_expected,

pvlib/tests/iotools/test_srml.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ def test_get_srml_minute():
146146
expected_index = pd.date_range(start='2018-01-01', end='2018-01-31 23:59',
147147
freq='1min', tz='Etc/GMT+8')
148148
assert_index_equal(data_get.index, expected_index)
149-
assert all([c in data_get.columns for c in data_read.columns])
149+
assert all(c in data_get.columns for c in data_read.columns)
150150
# Check that all indices in example file are present in remote file
151151
assert data_read.index.isin(data_get.index).all()
152152
assert meta['station'] == 'EU'

pvlib/tests/test_modelchain.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2018,5 +2018,5 @@ def test_ModelChainResult___repr__(sapm_dc_snl_ac_system, location, weather):
20182018
mcres = mc.results.__repr__()
20192019
mc_attrs = dir(mc.results)
20202020
mc_attrs = [a for a in mc_attrs if not a.startswith('_')]
2021-
assert all([a in mcres for a in mc_attrs])
2021+
assert all(a in mcres for a in mc_attrs)
20222022

0 commit comments

Comments
 (0)