Fixed CachedGenerator not caching all the generated values if the first to request the property was stopping the iteration early.

Author: jordanbriere

src/core/modules/core/core_cache.cpp

@@ -250,25 +250,17 @@ object CCachedGenerator::get_generator()
 
 object CCachedGenerator::__iter__()
 {
-	return m_generator.is_none() ? m_generated_values.attr("__iter__")() : object(ptr(this));
-}
-
-
-object CCachedGenerator::__next__()
-{
-	object value;
-	if (!m_generator.is_none())
+	while(!m_generator.is_none())
 	{
 		try
 		{
-			value = m_generator.attr("__next__")();
-			m_generated_values.append(value);
+			m_generated_values.append(m_generator.attr("__next__")());
 		}
 		catch(...)
 		{
 			m_generator = object();
-			BOOST_RAISE_EXCEPTION(PyExc_StopIteration, "StopIteration");
+			PyErr_Clear();
 		}
 	}
-	return value;
+	return m_generated_values.attr("__iter__")();
 }

src/core/modules/core/core_cache.h

@@ -93,7 +93,6 @@ class CCachedGenerator
 	object get_generator();
 
 	object __iter__();
-	object __next__();
 
 private:
 	object m_generator;

src/core/modules/core/core_cache_wrap.cpp

@@ -314,10 +314,4 @@ void export_cached_generator(scope _cache)
 		&CCachedGenerator::__iter__,
 		"Returns an iterator iterating over the generated values of the wrapped generator."
 	);
-
-	CachedGenerator.def(
-		"__next__",
-		&CCachedGenerator::__next__,
-		"Returns the next value from the current iteration."
-	);
 }