IExtendedDictionary.items() Method Returns PyList

QuantConnect · Apr 1, 2020 · f47c469 · f47c469
1 parent e17326e
commit f47c469
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/Common/ExtendedDictionary.cs b/Common/ExtendedDictionary.cs
@@ -203,15 +203,25 @@ public T get(Symbol symbol, T value)
         /// Returns a view object that displays a list of dictionary's (Symbol, value) tuple pairs.
         /// </summary>
         /// <returns>Returns a view object that displays a list of a given dictionary's (Symbol, value) tuple pair.</returns>
-        public IEnumerable<PyTuple> items()
+        public PyList items()
         {
-            foreach (var key in GetKeys)
+            using (Py.GIL())
             {
-                object data = this[key];
-                using (Py.GIL())
+                var pyList = new PyList();
+                foreach (var key in GetKeys)
                 {
-                    yield return new PyTuple(new PyObject[] { key.ToPython(), data.ToPython() });
+                    using (var pyKey = key.ToPython())
+                    {
+                        using (var pyValue = this[key].ToPython())
+                        {
+                            using (var pyObject = new PyTuple(new PyObject[] { pyKey, pyValue }))
+                            {
+                                pyList.Append(pyObject);
+                            }
+                        }
+                    }
                 }
+                return pyList;
             }
         }
 

diff --git a/Common/Interfaces/IExtendedDictionary.cs b/Common/Interfaces/IExtendedDictionary.cs
@@ -14,7 +14,6 @@
 */
 
 using Python.Runtime;
-using System.Collections.Generic;
 
 namespace QuantConnect.Interfaces
 {
@@ -71,7 +70,7 @@ public interface IExtendedDictionary<TKey, TValue>
         /// Returns a view object that displays a list of dictionary's (key, value) tuple pairs.
         /// </summary>
         /// <returns>Returns a view object that displays a list of a given dictionary's (key, value) tuple pair.</returns>
-        IEnumerable<PyTuple> items();
+        PyList items();
 
         /// <summary>
         /// Returns a view object that displays a list of all the keys in the dictionary