@@ -38,7 +38,7 @@ internal static void Shutdown()
         {
             foreach (var item in cache.Values)
             {
-                Runtime.Py_DecRef(item.pyHandle);
+                Runtime.XDecref(item.pyHandle);
             }
             cache.Clear();
         }
 
@@ -7,7 +7,7 @@
 
 namespace Python.Runtime
 {
-    public class ResolveStreamResouceArgs : EventArgs
+    public class ResolveStreamResourceArgs : EventArgs
     {
         public string Name { get; set; }
     }
@@ -17,7 +17,7 @@ public class ResolveStreamResouceArgs : EventArgs
     /// </summary>
     public class PythonEngine : IDisposable
     {
-        public static event Func<ResolveStreamResouceArgs, Stream> StreamResouceResolve;
+        public static event Func<ResolveStreamResourceArgs, Stream> StreamResourceResolve;
 
         private static DelegateManager delegateManager;
         private static bool initialized;
@@ -543,14 +543,14 @@ internal static PyObject RunString(string code, IntPtr? globals, IntPtr? locals,
 
         private static Stream LoadResource(string name)
         {
-            var args = new ResolveStreamResouceArgs()
+            var args = new ResolveStreamResourceArgs()
             {
                 Name = name
             };
             Stream stream;
-            if (StreamResouceResolve != null)
+            if (StreamResourceResolve != null)
             {
-                foreach (Func<ResolveStreamResouceArgs, Stream> resolver in StreamResouceResolve.GetInvocationList())
+                foreach (Func<ResolveStreamResourceArgs, Stream> resolver in StreamResourceResolve.GetInvocationList())
                 {
                     stream = resolver(args);
                     if (stream != null)
@@ -560,7 +560,7 @@ private static Stream LoadResource(string name)
                 }
             }
             Assembly assembly = Assembly.GetExecutingAssembly();
-            stream = assembly.GetManifestResourceStream("clr.py");
+            stream = assembly.GetManifestResourceStream(name);
             return stream;
         }
     }
 
@@ -81,7 +81,7 @@ public PyTuple(PyObject[] items)
                 Runtime.XIncref(ptr);
                 if (Runtime.PyTuple_SetItem(obj, i, ptr) != 0)
                 {
-                    for (int j = i; j >= 0; j--)
+                    for (int j = i - 1; j >= 0; j--)
                     {
                         Runtime.XDecref(items[j].obj);
                     }
Original file line number	Diff line number	Diff line change
@@ -38,7 +38,7 @@ internal static void Shutdown()
38	38	{
39	39	foreach (var item in cache.Values)
40	40	{
41		- Runtime.Py_DecRef(item.pyHandle);
	41	+ Runtime.XDecref(item.pyHandle);
42	42	}
43	43	cache.Clear();
44	44	}
Original file line number	Diff line number	Diff line change
@@ -7,7 +7,7 @@
7	7
8	8	namespace Python.Runtime
9	9	{
10		- public class ResolveStreamResouceArgs : EventArgs
	10	+ public class ResolveStreamResourceArgs : EventArgs
11	11	{
12	12	public string Name { get; set; }
13	13	}
@@ -17,7 +17,7 @@ public class ResolveStreamResouceArgs : EventArgs
17	17	/// </summary>
18	18	public class PythonEngine : IDisposable
19	19	{
20		- public static event Func<ResolveStreamResouceArgs, Stream> StreamResouceResolve;
	20	+ public static event Func<ResolveStreamResourceArgs, Stream> StreamResourceResolve;
21	21
22	22	private static DelegateManager delegateManager;
23	23	private static bool initialized;
@@ -543,14 +543,14 @@ internal static PyObject RunString(string code, IntPtr? globals, IntPtr? locals,
543	543
544	544	private static Stream LoadResource(string name)
545	545	{
546		- var args = new ResolveStreamResouceArgs()
	546	+ var args = new ResolveStreamResourceArgs()
547	547	{
548	548	Name = name
549	549	};
550	550	Stream stream;
551		- if (StreamResouceResolve != null)
	551	+ if (StreamResourceResolve != null)
552	552	{
553		- foreach (Func<ResolveStreamResouceArgs, Stream> resolver in StreamResouceResolve.GetInvocationList())
	553	+ foreach (Func<ResolveStreamResourceArgs, Stream> resolver in StreamResourceResolve.GetInvocationList())
554	554	{
555	555	stream = resolver(args);
556	556	if (stream != null)
@@ -560,7 +560,7 @@ private static Stream LoadResource(string name)
560	560	}
561	561	}
562	562	Assembly assembly = Assembly.GetExecutingAssembly();
563		- stream = assembly.GetManifestResourceStream("clr.py");
	563	+ stream = assembly.GetManifestResourceStream(name);
564	564	return stream;
565	565	}
566	566	}
Original file line number	Diff line number	Diff line change
@@ -81,7 +81,7 @@ public PyTuple(PyObject[] items)
81	81	Runtime.XIncref(ptr);
82	82	if (Runtime.PyTuple_SetItem(obj, i, ptr) != 0)
83	83	{
84		- for (int j = i; j >= 0; j--)
	84	+ for (int j = i - 1; j >= 0; j--)
85	85	{
86	86	Runtime.XDecref(items[j].obj);
87	87	}