Commit cc1f2cb7 authored by Marco Clemencic's avatar Marco Clemencic

Merge branch '129-fix-for-py37'

Fix propagation of StopIteration exception

Closes #129

See merge request !1093
parents 44b20934 1d065e2f
Pipeline #1727994 passed with stages
in 15 minutes and 51 seconds
......@@ -29,7 +29,7 @@ class TestCase(unittest.TestCase):
def test_010_Function(self):
import PyExample
self.assertEquals(PyExample.greet(), "hello, world")
self.assertEqual(PyExample.greet(), "hello, world")
if __name__ == '__main__':
......
......@@ -1567,8 +1567,11 @@ def applyConfigurableUsers():
# easiest way to fix bug #103803.
# <https://savannah.cern.ch/bugs/?103803>
while True:
yield next(c for c in Configurable.allConfigurables.values()
if c.isApplicable())
try:
yield next(c for c in Configurable.allConfigurables.values()
if c.isApplicable())
except StopIteration:
break
debugApplyOrder = 'GAUDI_DUBUG_CONF_USER' in os.environ
for c in applicableConfUsers():
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment