Refactor

budgetdevv · budgetdevv · commit fa77121f713c · 2024-03-18T17:40:14.000+08:00
diff --git a/ConsoleTest/Program.cs b/ConsoleTest/Program.cs
@@ -2,11 +2,11 @@
 using System.Threading.Tasks;
 using Python.Runtime;
 using PythonNETExtensions.Awaiters;
+using PythonNETExtensions.Config;
 using PythonNETExtensions.Core;
 using PythonNETExtensions.Modules;
 using PythonNETExtensions.Modules.PythonBuiltIn;
-using PythonNETExtensions.PythonConfig;
-using PythonNETExtensions.PythonVersions;
+using PythonNETExtensions.Versions;
 
 namespace ConsoleTest
 {
@@ -27,15 +27,16 @@ private static async Task Main(string[] args)
             using (new PythonHandle())
             {
                 var helloWorldText = "Hello World!";
+
+                var sys = PythonExtensions.GetPythonModule<SysModule>();
+
+                var result = RawPython.Run<string>(
+                $"""
+                print({new RawPython.PythonObject(helloWorldText)});
+                return {new RawPython.PythonObject(sys)}.executable;
+                """);
                 
-                new PythonMethodHandle
-                (
-                    parameters: [ nameof(helloWorldText) ],
-                    methodBody: 
-                    $"""
-                    print({nameof(helloWorldText)});
-                    """
-                ).Method(helloWorldText);
+                Console.WriteLine(result);
                 
                 // Numpy module
                 dynamic np = PythonExtensions.GetPythonModule<Numpy>();
diff --git a/PythonNETExtensions/Config/DefaultPythonConfig.cs b/PythonNETExtensions/Config/DefaultPythonConfig.cs
@@ -1,4 +1,4 @@
-namespace PythonNETExtensions.PythonConfig
+namespace PythonNETExtensions.Config
 {
     public struct DefaultPythonConfig: IPythonConfig<DefaultPythonConfig>
     {
diff --git a/PythonNETExtensions/Config/IPythonConfig.cs b/PythonNETExtensions/Config/IPythonConfig.cs
@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace PythonNETExtensions.PythonConfig
+namespace PythonNETExtensions.Config
 {
     public interface IPythonConfig<PyConfigT> where PyConfigT: struct, IPythonConfig<PyConfigT>
     {
diff --git a/PythonNETExtensions/Core/PythonCore.cs b/PythonNETExtensions/Core/PythonCore.cs
@@ -10,11 +10,11 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Python.Runtime;
+using PythonNETExtensions.Config;
 using PythonNETExtensions.Helpers;
 using PythonNETExtensions.Modules;
 using PythonNETExtensions.Modules.PythonBuiltIn;
-using PythonNETExtensions.PythonConfig;
-using PythonNETExtensions.PythonVersions;
+using PythonNETExtensions.Versions;
 
 namespace PythonNETExtensions.Core
 {
diff --git a/PythonNETExtensions/Core/PythonMethodHandle.cs b/PythonNETExtensions/Core/PythonMethodHandle.cs
@@ -2,7 +2,6 @@
 using System.Runtime.CompilerServices;
 using System.Threading;
 using Python.Runtime;
-using PythonNETExtensions.Modules;
 using PythonNETExtensions.Modules.PythonBuiltIn;
 
 namespace PythonNETExtensions.Core
diff --git a/PythonNETExtensions/Versions/IPythonVersion.cs b/PythonNETExtensions/Versions/IPythonVersion.cs
@@ -2,9 +2,9 @@
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.CompilerServices;
-using PythonNETExtensions.PythonConfig;
+using PythonNETExtensions.Config;
 
-namespace PythonNETExtensions.PythonVersions
+namespace PythonNETExtensions.Versions
 {
     public interface IPythonVersion<PyVersionT, PyConfigT>
         where PyVersionT: struct, IPythonVersion<PyVersionT, PyConfigT>
diff --git a/PythonNETExtensions/Versions/PlatformEmbeddedPython.cs b/PythonNETExtensions/Versions/PlatformEmbeddedPython.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace PythonNETExtensions.PythonVersions
+namespace PythonNETExtensions.Versions
 {
     public struct PlatformEmbeddedPython
     {
diff --git a/PythonNETExtensions/Versions/PyVer3_11.cs b/PythonNETExtensions/Versions/PyVer3_11.cs
@@ -1,7 +1,6 @@
-using System;
-using PythonNETExtensions.PythonConfig;
+using PythonNETExtensions.Config;
 
-namespace PythonNETExtensions.PythonVersions
+namespace PythonNETExtensions.Versions
 {
     public readonly struct PyVer3_11<PyConfigT>: IPythonVersion<PyVer3_11<PyConfigT>, PyConfigT> 
         where PyConfigT : struct, IPythonConfig<PyConfigT>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace PythonNETExtensions.PythonConfig`
	`1`	`+namespace PythonNETExtensions.Config`
`2`	`2`	`{`
`3`	`3`	`public struct DefaultPythonConfig: IPythonConfig<DefaultPythonConfig>`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System.IO;`
`2`	`2`
`3`		`-namespace PythonNETExtensions.PythonConfig`
	`3`	`+namespace PythonNETExtensions.Config`
`4`	`4`	`{`
`5`	`5`	`public interface IPythonConfig<PyConfigT> where PyConfigT: struct, IPythonConfig<PyConfigT>`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Runtime.InteropServices;`
`3`	`3`
`4`		`-namespace PythonNETExtensions.PythonVersions`
	`4`	`+namespace PythonNETExtensions.Versions`
`5`	`5`	`{`
`6`	`6`	`public struct PlatformEmbeddedPython`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`		`-using System;`
`2`		`-using PythonNETExtensions.PythonConfig;`
	`1`	`+using PythonNETExtensions.Config;`
`3`	`2`
`4`		`-namespace PythonNETExtensions.PythonVersions`
	`3`	`+namespace PythonNETExtensions.Versions`
`5`	`4`	`{`
`6`	`5`	`public readonly struct PyVer3_11<PyConfigT>: IPythonVersion<PyVer3_11<PyConfigT>, PyConfigT>`
`7`	`6`	`where PyConfigT : struct, IPythonConfig<PyConfigT>`