From 71921901f03bbfbdfa731c3d94f94ddf4ae28455 Mon Sep 17 00:00:00 2001 From: Jurgen Lentz Date: Fri, 31 Jan 2025 15:37:31 +0100 Subject: [PATCH] other fixes --- amplpy/iterators.pxi | 4 +++- amplpy/tests/test_environment.py | 9 +++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/amplpy/iterators.pxi b/amplpy/iterators.pxi index d6256b7..b94224e 100644 --- a/amplpy/iterators.pxi +++ b/amplpy/iterators.pxi @@ -20,7 +20,9 @@ cdef class EnvIterator(object): return self def __next__(self): - if self.iterator >= self.end: + cdef int equal + campl.AMPL_EnvironmentFindEnvironmentEqual(self.iterator, self.end, &equal) + if equal: raise StopIteration cdef campl.AMPL_ENVIRONMENTITERATOR* it = self.iterator campl.AMPL_EnvironmentGetEnvironmentVarIterate(self.env_c, &it) diff --git a/amplpy/tests/test_environment.py b/amplpy/tests/test_environment.py index bde519f..2658dd2 100644 --- a/amplpy/tests/test_environment.py +++ b/amplpy/tests/test_environment.py @@ -21,19 +21,16 @@ def test_environment_initialization(self): self.assertEqual("binary_name_2", env.get_bin_name()) def test_environment(self): + os.environ["USER1"] = "Filipe Brandão" from amplpy import Environment, AMPL - #os.environ["PYTHONIOENCODING"] = "utf-8" - os.environ["USER1"] = "Filipe Brandão" - env1 = Environment() env2 = Environment(os.curdir) self.assertEqual(env2.get_bin_dir(), os.curdir) env1.set_bin_dir(env2.get_bin_dir()) self.assertEqual(env1.get_bin_dir(), env1.get_bin_dir()) - #self.assertEqual(len(dict(env1)), len(list(env1))) - #self.assertEqual(list(sorted(dict(env1).items())), list(sorted(env1))) - self.assertEqual(len(env1["USER1"]), len("Filipe Brandão")) + self.assertEqual(len(dict(env1)), len(list(env1))) + self.assertEqual(list(sorted(dict(env1).items())), list(sorted(env1))) env1["MyEnvVar"] = "TEST" self.assertEqual(env1["MyEnvVar"], "TEST") self.assertEqual(env2["MyEnvVar"], None)