Format pythoengine changes.

vmuriart · vmuriart · commit 5634ccb8a2a4 · 2017-02-15T10:39:17.000-07:00
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -407,13 +407,13 @@ public static PyObject ModuleFromString(string name, string code)
 
         public static PyObject Eval(string code, IntPtr? globals = null, IntPtr? locals = null)
         {
-            var result = RunString(code, globals, locals, RunFlagType.Eval);
+            PyObject result = RunString(code, globals, locals, RunFlagType.Eval);
             return result;
         }
 
         public static void Exec(string code, IntPtr? globals = null, IntPtr? locals = null)
         {
-            var result = RunString(code, globals, locals, RunFlagType.File);
+            PyObject result = RunString(code, globals, locals, RunFlagType.File);
             if (result.obj != Runtime.PyNone)
             {
                 throw new PythonException();
@@ -483,7 +483,7 @@ public static PyObject RunString(
     public enum RunFlagType
     {
         Single = 256,
-        File = 257,   /* Py_file_input */
+        File = 257, /* Py_file_input */
         Eval = 258
     }
 
@@ -493,11 +493,12 @@ public class PyScope : IDisposable
         /// the dict for global variables
         /// </summary>
         private IntPtr globals;
+
         /// <summary>
         /// the dict for local variables
         /// </summary>
         private IntPtr locals;
-        
+
         public PyScope()
         {
             globals = Runtime.PyDict_New();
@@ -526,8 +527,8 @@ public PyScope()
         /// </remarks>
         public PyObject Import(string name)
         {
-            var module = PythonEngine.ImportModule(name);
-            this.SetGlobal(name, module);
+            PyObject module = PythonEngine.ImportModule(name);
+            SetGlobal(name, module);
             return module;
         }
 
@@ -542,8 +543,8 @@ public PyObject Eval(string code)
         {
             var flag = (IntPtr)RunFlagType.Eval;
             IntPtr ptr = Runtime.PyRun_String(
-                    code, flag, globals, locals
-                );
+                code, flag, globals, locals
+            );
             Py.Throw();
             return new PyObject(ptr);
         }
@@ -558,8 +559,8 @@ public void ExecIn(string code)
         {
             var flag = (IntPtr)RunFlagType.File;
             IntPtr ptr = Runtime.PyRun_String(
-                    code, flag, globals, locals
-                );
+                code, flag, globals, locals
+            );
             Py.Throw();
             if (ptr != Runtime.PyNone)
             {
@@ -575,7 +576,7 @@ public void ExecIn(string code)
         /// </remarks>
         public void Exec(string code)
         {
-            var _locals = Runtime.PyDict_New();
+            IntPtr _locals = Runtime.PyDict_New();
             if (_locals == IntPtr.Zero)
             {
                 throw new PythonException();
@@ -587,8 +588,8 @@ public void Exec(string code)
             }
             var flag = (IntPtr)RunFlagType.File;
             IntPtr ptr = Runtime.PyRun_String(
-                    code, flag, globals, _locals
-                );
+                code, flag, globals, _locals
+            );
             Py.Throw();
             if (ptr != Runtime.PyNone)
             {
@@ -601,7 +602,7 @@ public void Exec(string code)
         /// SetGlobal Method
         /// </summary>
         /// <remarks>
-        /// Add a new variable to global variable dict if it not exists 
+        /// Add a new variable to global variable dict if it not exists
         /// or set the value of the global variable if it exists.
         /// </remarks>
         public void SetGlobal(string name, object value)
@@ -639,7 +640,7 @@ public void DelGlobal(string name)
         /// SetLocal Method
         /// </summary>
         /// <remarks>
-        /// Add a new variable to local variable dict if it not exists 
+        /// Add a new variable to local variable dict if it not exists
         /// or set the value of the local variable if it exists.
         /// </remarks>
         public void SetLocal(string name, object value)
@@ -683,7 +684,7 @@ public bool Exists(string name)
         {
             using (var pyKey = new PyString(name))
             {
-                if(Runtime.PyMapping_HasKey(locals, pyKey.obj) != 0)
+                if (Runtime.PyMapping_HasKey(locals, pyKey.obj) != 0)
                 {
                     return true;
                 }
@@ -792,6 +793,7 @@ public static GILState GIL()
 
             return new GILState();
         }
+
         public static PySession Session()
         {
             if (!PythonEngine.IsInitialized)

Original file line number	Diff line number	Diff line change
`@@ -407,13 +407,13 @@ public static PyObject ModuleFromString(string name, string code)`
`407`	`407`
`408`	`408`	`public static PyObject Eval(string code, IntPtr? globals = null, IntPtr? locals = null)`
`409`	`409`	`{`
`410`		`- var result = RunString(code, globals, locals, RunFlagType.Eval);`
	`410`	`+ PyObject result = RunString(code, globals, locals, RunFlagType.Eval);`
`411`	`411`	`return result;`
`412`	`412`	`}`
`413`	`413`
`414`	`414`	`public static void Exec(string code, IntPtr? globals = null, IntPtr? locals = null)`
`415`	`415`	`{`
`416`		`- var result = RunString(code, globals, locals, RunFlagType.File);`
	`416`	`+ PyObject result = RunString(code, globals, locals, RunFlagType.File);`
`417`	`417`	`if (result.obj != Runtime.PyNone)`
`418`	`418`	`{`
`419`	`419`	`throw new PythonException();`
`@@ -483,7 +483,7 @@ public static PyObject RunString(`
`483`	`483`	`public enum RunFlagType`
`484`	`484`	`{`
`485`	`485`	`Single = 256,`
`486`		`- File = 257, /* Py_file_input */`
	`486`	`+ File = 257, /* Py_file_input */`
`487`	`487`	`Eval = 258`
`488`	`488`	`}`
`489`	`489`
`@@ -493,11 +493,12 @@ public class PyScope : IDisposable`
`493`	`493`	`/// the dict for global variables`
`494`	`494`	`/// </summary>`
`495`	`495`	`private IntPtr globals;`
	`496`	`+`
`496`	`497`	`/// <summary>`
`497`	`498`	`/// the dict for local variables`
`498`	`499`	`/// </summary>`
`499`	`500`	`private IntPtr locals;`
`500`		`-`
	`501`	`+`
`501`	`502`	`public PyScope()`
`502`	`503`	`{`
`503`	`504`	`globals = Runtime.PyDict_New();`
`@@ -526,8 +527,8 @@ public PyScope()`
`526`	`527`	`/// </remarks>`
`527`	`528`	`public PyObject Import(string name)`
`528`	`529`	`{`
`529`		`- var module = PythonEngine.ImportModule(name);`
`530`		`- this.SetGlobal(name, module);`
	`530`	`+ PyObject module = PythonEngine.ImportModule(name);`
	`531`	`+ SetGlobal(name, module);`
`531`	`532`	`return module;`
`532`	`533`	`}`
`533`	`534`
`@@ -542,8 +543,8 @@ public PyObject Eval(string code)`
`542`	`543`	`{`
`543`	`544`	`var flag = (IntPtr)RunFlagType.Eval;`
`544`	`545`	`IntPtr ptr = Runtime.PyRun_String(`
`545`		`- code, flag, globals, locals`
`546`		`- );`
	`546`	`+ code, flag, globals, locals`
	`547`	`+ );`
`547`	`548`	`Py.Throw();`
`548`	`549`	`return new PyObject(ptr);`
`549`	`550`	`}`
`@@ -558,8 +559,8 @@ public void ExecIn(string code)`
`558`	`559`	`{`
`559`	`560`	`var flag = (IntPtr)RunFlagType.File;`
`560`	`561`	`IntPtr ptr = Runtime.PyRun_String(`
`561`		`- code, flag, globals, locals`
`562`		`- );`
	`562`	`+ code, flag, globals, locals`
	`563`	`+ );`
`563`	`564`	`Py.Throw();`
`564`	`565`	`if (ptr != Runtime.PyNone)`
`565`	`566`	`{`
`@@ -575,7 +576,7 @@ public void ExecIn(string code)`
`575`	`576`	`/// </remarks>`
`576`	`577`	`public void Exec(string code)`
`577`	`578`	`{`
`578`		`- var _locals = Runtime.PyDict_New();`
	`579`	`+ IntPtr _locals = Runtime.PyDict_New();`
`579`	`580`	`if (_locals == IntPtr.Zero)`
`580`	`581`	`{`
`581`	`582`	`throw new PythonException();`
`@@ -587,8 +588,8 @@ public void Exec(string code)`
`587`	`588`	`}`
`588`	`589`	`var flag = (IntPtr)RunFlagType.File;`
`589`	`590`	`IntPtr ptr = Runtime.PyRun_String(`
`590`		`- code, flag, globals, _locals`
`591`		`- );`
	`591`	`+ code, flag, globals, _locals`
	`592`	`+ );`
`592`	`593`	`Py.Throw();`
`593`	`594`	`if (ptr != Runtime.PyNone)`
`594`	`595`	`{`
`@@ -601,7 +602,7 @@ public void Exec(string code)`
`601`	`602`	`/// SetGlobal Method`
`602`	`603`	`/// </summary>`
`603`	`604`	`/// <remarks>`
`604`		`- /// Add a new variable to global variable dict if it not exists`
	`605`	`+ /// Add a new variable to global variable dict if it not exists`
`605`	`606`	`/// or set the value of the global variable if it exists.`
`606`	`607`	`/// </remarks>`
`607`	`608`	`public void SetGlobal(string name, object value)`
`@@ -639,7 +640,7 @@ public void DelGlobal(string name)`
`639`	`640`	`/// SetLocal Method`
`640`	`641`	`/// </summary>`
`641`	`642`	`/// <remarks>`
`642`		`- /// Add a new variable to local variable dict if it not exists`
	`643`	`+ /// Add a new variable to local variable dict if it not exists`
`643`	`644`	`/// or set the value of the local variable if it exists.`
`644`	`645`	`/// </remarks>`
`645`	`646`	`public void SetLocal(string name, object value)`
`@@ -683,7 +684,7 @@ public bool Exists(string name)`
`683`	`684`	`{`
`684`	`685`	`using (var pyKey = new PyString(name))`
`685`	`686`	`{`
`686`		`- if(Runtime.PyMapping_HasKey(locals, pyKey.obj) != 0)`
	`687`	`+ if (Runtime.PyMapping_HasKey(locals, pyKey.obj) != 0)`
`687`	`688`	`{`
`688`	`689`	`return true;`
`689`	`690`	`}`
`@@ -792,6 +793,7 @@ public static GILState GIL()`
`792`	`793`
`793`	`794`	`return new GILState();`
`794`	`795`	`}`
	`796`	`+`
`795`	`797`	`public static PySession Session()`
`796`	`798`	`{`
`797`	`799`	`if (!PythonEngine.IsInitialized)`