pythonnet · filmor · Jan 9, 2022 · Jan 8, 2022 · Jan 8, 2022
diff --git a/src/runtime/assemblymanager.cs → src/runtime/AssemblyManager.cs b/src/runtime/assemblymanager.cs → src/runtime/AssemblyManager.cs
diff --git a/src/runtime/classmanager.cs → src/runtime/ClassManager.cs b/src/runtime/classmanager.cs → src/runtime/ClassManager.cs
diff --git a/src/runtime/Codecs/IPyObjectDecoder.cs b/src/runtime/Codecs/IPyObjectDecoder.cs
@@ -0,0 +1,22 @@
+namespace Python.Runtime;
+
+using System;
+
+/// <summary>
+/// Defines <see cref="PyObject"/> conversion to CLR types (unmarshalling)
+/// </summary>
+public interface IPyObjectDecoder
+{
+    /// <summary>
+    /// Checks if this decoder can decode from <paramref name="objectType"/> to <paramref name="targetType"/>
+    /// </summary>
+    bool CanDecode(PyType objectType, Type targetType);
+    /// <summary>
+    /// Attempts do decode <paramref name="pyObj"/> into a variable of specified type
+    /// </summary>
+    /// <typeparam name="T">CLR type to decode into</typeparam>
+    /// <param name="pyObj">Object to decode</param>
+    /// <param name="value">The variable, that will receive decoding result</param>
+    /// <returns></returns>
+    bool TryDecode<T>(PyObject pyObj, out T? value);
+}
diff --git a/src/runtime/Codecs/IPyObjectEncoder.cs b/src/runtime/Codecs/IPyObjectEncoder.cs
@@ -0,0 +1,18 @@
+namespace Python.Runtime;
+
+using System;
+
+/// <summary>
+/// Defines conversion from CLR objects into Python objects (e.g. <see cref="PyObject"/>) (marshalling)
+/// </summary>
+public interface IPyObjectEncoder
+{
+    /// <summary>
+    /// Checks if encoder can encode CLR objects of specified type
+    /// </summary>
+    bool CanEncode(Type type);
+    /// <summary>
+    /// Attempts to encode CLR object <paramref name="value"/> into Python object
+    /// </summary>
+    PyObject? TryEncode(object value);
+}
diff --git a/src/runtime/converterextensions.cs → src/runtime/Codecs/PyObjectConversions.cs b/src/runtime/converterextensions.cs → src/runtime/Codecs/PyObjectConversions.cs
@@ -6,41 +6,8 @@ namespace Python.Runtime
     using System.Diagnostics;
     using System.Linq;
     using System.Reflection;
-    using Python.Runtime.Codecs;
-
-    /// <summary>
-    /// Defines <see cref="PyObject"/> conversion to CLR types (unmarshalling)
-    /// </summary>
-    public interface IPyObjectDecoder
-    {
-        /// <summary>
-        /// Checks if this decoder can decode from <paramref name="objectType"/> to <paramref name="targetType"/>
-        /// </summary>
-        bool CanDecode(PyType objectType, Type targetType);
-        /// <summary>
-        /// Attempts do decode <paramref name="pyObj"/> into a variable of specified type
-        /// </summary>
-        /// <typeparam name="T">CLR type to decode into</typeparam>
-        /// <param name="pyObj">Object to decode</param>
-        /// <param name="value">The variable, that will receive decoding result</param>
-        /// <returns></returns>
-        bool TryDecode<T>(PyObject pyObj, out T? value);
-    }
 
-    /// <summary>
-    /// Defines conversion from CLR objects into Python objects (e.g. <see cref="PyObject"/>) (marshalling)
-    /// </summary>
-    public interface IPyObjectEncoder
-    {
-        /// <summary>
-        /// Checks if encoder can encode CLR objects of specified type
-        /// </summary>
-        bool CanEncode(Type type);
-        /// <summary>
-        /// Attempts to encode CLR object <paramref name="value"/> into Python object
-        /// </summary>
-        PyObject? TryEncode(object value);
-    }
+    using Python.Runtime.Codecs;
 
     /// <summary>
     /// This class allows to register additional marshalling codecs.

diff --git a/src/runtime/converter.cs → src/runtime/Converter.cs b/src/runtime/converter.cs → src/runtime/Converter.cs
diff --git a/src/runtime/delegatemanager.cs → src/runtime/DelegateManager.cs b/src/runtime/delegatemanager.cs → src/runtime/DelegateManager.cs
diff --git a/src/runtime/exceptions.cs → src/runtime/Exceptions.cs b/src/runtime/exceptions.cs → src/runtime/Exceptions.cs
@@ -5,87 +5,6 @@
 
 namespace Python.Runtime
 {
-    /// <summary>
-    /// Base class for Python types that reflect managed exceptions based on
-    /// System.Exception
-    /// </summary>
-    /// <remarks>
-    /// The Python wrapper for managed exceptions LIES about its inheritance
-    /// tree. Although the real System.Exception is a subclass of
-    /// System.Object the Python type for System.Exception does NOT claim that
-    /// it subclasses System.Object. Instead TypeManager.CreateType() uses
-    /// Python's exception.Exception class as base class for System.Exception.
-    /// </remarks>
-    [Serializable]
-    internal class ExceptionClassObject : ClassObject
-    {
-        internal ExceptionClassObject(Type tp) : base(tp)
-        {
-        }
-
-        internal static Exception? ToException(BorrowedReference ob)
-        {
-            var co = GetManagedObject(ob) as CLRObject;
-            return co?.inst as Exception;
-        }
-
-        /// <summary>
-        /// Exception __repr__ implementation
-        /// </summary>
-        public new static NewReference tp_repr(BorrowedReference ob)
-        {
-            Exception? e = ToException(ob);
-            if (e == null)
-            {
-                return Exceptions.RaiseTypeError("invalid object");
-            }
-            string name = e.GetType().Name;
-            string message;
-            if (e.Message != String.Empty)
-            {
-                message = String.Format("{0}('{1}')", name, e.Message);
-            }
-            else
-            {
-                message = String.Format("{0}()", name);
-            }
-            return Runtime.PyString_FromString(message);
-        }
-
-        /// <summary>
-        /// Exception __str__ implementation
-        /// </summary>
-        public new static NewReference tp_str(BorrowedReference ob)
-        {
-            Exception? e = ToException(ob);
-            if (e == null)
-            {
-                return Exceptions.RaiseTypeError("invalid object");
-            }
-
-            string message = e.ToString();
-            string fullTypeName = e.GetType().FullName;
-            string prefix = fullTypeName + ": ";
-            if (message.StartsWith(prefix))
-            {
-                message = message.Substring(prefix.Length);
-            }
-            else if (message.StartsWith(fullTypeName))
-            {
-                message = message.Substring(fullTypeName.Length);
-            }
-            return Runtime.PyString_FromString(message);
-        }
-
-        public override bool Init(BorrowedReference obj, BorrowedReference args, BorrowedReference kw)
-        {
-            if (!base.Init(obj, args, kw)) return false;
-
-            var e = (CLRObject)GetManagedObject(obj)!;
-
-            return Exceptions.SetArgsAndCause(obj, (Exception)e.inst);
-        }
-    }
 
     /// <summary>
     /// Encapsulates the Python exception APIs.

diff --git a/src/runtime/finalizer.cs → src/runtime/Finalizer.cs b/src/runtime/finalizer.cs → src/runtime/Finalizer.cs
diff --git a/src/runtime/importhook.cs → src/runtime/ImportHook.cs b/src/runtime/importhook.cs → src/runtime/ImportHook.cs
diff --git a/src/runtime/interfaces.cs → src/runtime/Interfaces.cs b/src/runtime/interfaces.cs → src/runtime/Interfaces.cs
diff --git a/src/runtime/intern.cs → src/runtime/InternString.cs b/src/runtime/intern.cs → src/runtime/InternString.cs
diff --git a/src/runtime/interop.cs → src/runtime/Interop.cs b/src/runtime/interop.cs → src/runtime/Interop.cs
diff --git a/src/runtime/loader.cs → src/runtime/Loader.cs b/src/runtime/loader.cs → src/runtime/Loader.cs
diff --git a/src/runtime/methodbinder.cs → src/runtime/MethodBinder.cs b/src/runtime/methodbinder.cs → src/runtime/MethodBinder.cs
diff --git a/src/runtime/native/ABI.cs → src/runtime/Native/ABI.cs b/src/runtime/native/ABI.cs → src/runtime/Native/ABI.cs
diff --git a/src/runtime/BorrowedReference.cs → src/runtime/Native/BorrowedReference.cs b/src/runtime/BorrowedReference.cs → src/runtime/Native/BorrowedReference.cs
diff --git a/src/runtime/CustomMarshaler.cs → src/runtime/Native/CustomMarshaler.cs b/src/runtime/CustomMarshaler.cs → src/runtime/Native/CustomMarshaler.cs
diff --git a/src/runtime/native/GeneratedTypeOffsets.cs → src/runtime/Native/GeneratedTypeOffsets.cs b/src/runtime/native/GeneratedTypeOffsets.cs → src/runtime/Native/GeneratedTypeOffsets.cs
diff --git a/src/runtime/native/ITypeOffsets.cs → src/runtime/Native/ITypeOffsets.cs b/src/runtime/native/ITypeOffsets.cs → src/runtime/Native/ITypeOffsets.cs
diff --git a/src/runtime/platform/LibDL.cs → src/runtime/Native/LibDL.cs b/src/runtime/platform/LibDL.cs → src/runtime/Native/LibDL.cs
diff --git a/src/runtime/platform/LibraryLoader.cs → src/runtime/Native/LibraryLoader.cs b/src/runtime/platform/LibraryLoader.cs → src/runtime/Native/LibraryLoader.cs
diff --git a/src/runtime/nativecall.cs → src/runtime/Native/NativeCall.cs b/src/runtime/nativecall.cs → src/runtime/Native/NativeCall.cs
diff --git a/src/runtime/native/NativeFunc.cs → src/runtime/Native/NativeFunc.cs b/src/runtime/native/NativeFunc.cs → src/runtime/Native/NativeFunc.cs
diff --git a/src/runtime/native/NativeTypeSpec.cs → src/runtime/Native/NativeTypeSpec.cs b/src/runtime/native/NativeTypeSpec.cs → src/runtime/Native/NativeTypeSpec.cs
diff --git a/src/runtime/NewReference.cs → src/runtime/Native/NewReference.cs b/src/runtime/NewReference.cs → src/runtime/Native/NewReference.cs
diff --git a/src/runtime/bufferinterface.cs → src/runtime/Native/PyBufferInterface.cs b/src/runtime/bufferinterface.cs → src/runtime/Native/PyBufferInterface.cs
diff --git a/src/runtime/native/PyCompilerFlags.cs → src/runtime/Native/PyCompilerFlags.cs b/src/runtime/native/PyCompilerFlags.cs → src/runtime/Native/PyCompilerFlags.cs
diff --git a/src/runtime/native/PyGILState.cs → src/runtime/Native/PyGILState.cs b/src/runtime/native/PyGILState.cs → src/runtime/Native/PyGILState.cs
diff --git a/src/runtime/intern_.cs → src/runtime/Native/PyIdentifier_.cs b/src/runtime/intern_.cs → src/runtime/Native/PyIdentifier_.cs
diff --git a/src/runtime/intern_.tt → src/runtime/Native/PyIdentifier_.tt b/src/runtime/intern_.tt → src/runtime/Native/PyIdentifier_.tt
diff --git a/src/runtime/native/PyInterpreterState.cs → src/runtime/Native/PyInterpreterState.cs b/src/runtime/native/PyInterpreterState.cs → src/runtime/Native/PyInterpreterState.cs
diff --git a/src/runtime/native/PyMemberFlags.cs → src/runtime/Native/PyMemberFlags.cs b/src/runtime/native/PyMemberFlags.cs → src/runtime/Native/PyMemberFlags.cs
diff --git a/src/runtime/native/PyMemberType.cs → src/runtime/Native/PyMemberType.cs b/src/runtime/native/PyMemberType.cs → src/runtime/Native/PyMemberType.cs
diff --git a/src/runtime/native/PyMethodFlags.cs → src/runtime/Native/PyMethodFlags.cs b/src/runtime/native/PyMethodFlags.cs → src/runtime/Native/PyMethodFlags.cs
diff --git a/src/runtime/native/PyThreadState.cs → src/runtime/Native/PyThreadState.cs b/src/runtime/native/PyThreadState.cs → src/runtime/Native/PyThreadState.cs
diff --git a/src/runtime/ReferenceExtensions.cs → src/runtime/Native/ReferenceExtensions.cs b/src/runtime/ReferenceExtensions.cs → src/runtime/Native/ReferenceExtensions.cs
diff --git a/src/runtime/StolenReference.cs → src/runtime/Native/StolenReference.cs b/src/runtime/StolenReference.cs → src/runtime/Native/StolenReference.cs
diff --git a/src/runtime/native/StrPtr.cs → src/runtime/Native/StrPtr.cs b/src/runtime/native/StrPtr.cs → src/runtime/Native/StrPtr.cs
diff --git a/src/runtime/native/TypeOffset.cs → src/runtime/Native/TypeOffset.cs b/src/runtime/native/TypeOffset.cs → src/runtime/Native/TypeOffset.cs
diff --git a/src/runtime/interop310.cs → src/runtime/Native/TypeOffset310.cs b/src/runtime/interop310.cs → src/runtime/Native/TypeOffset310.cs
diff --git a/src/runtime/interop36.cs → src/runtime/Native/TypeOffset36.cs b/src/runtime/interop36.cs → src/runtime/Native/TypeOffset36.cs
diff --git a/src/runtime/interop37.cs → src/runtime/Native/TypeOffset37.cs b/src/runtime/interop37.cs → src/runtime/Native/TypeOffset37.cs
diff --git a/src/runtime/interop38.cs → src/runtime/Native/TypeOffset38.cs b/src/runtime/interop38.cs → src/runtime/Native/TypeOffset38.cs
diff --git a/src/runtime/interop39.cs → src/runtime/Native/TypeOffset39.cs b/src/runtime/interop39.cs → src/runtime/Native/TypeOffset39.cs
diff --git a/src/runtime/Python.Runtime.csproj b/src/runtime/Python.Runtime.csproj
@@ -50,10 +50,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="resources\clr.py">
+    <EmbeddedResource Include="Resources\clr.py">
       <LogicalName>clr.py</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="resources\interop.py">
+    <EmbeddedResource Include="Resources\interop.py">
       <LogicalName>interop.py</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="Mixins\*.py" />

diff --git a/src/runtime/pythonengine.cs → src/runtime/PythonEngine.cs b/src/runtime/pythonengine.cs → src/runtime/PythonEngine.cs
diff --git a/src/runtime/pythonexception.cs → src/runtime/PythonException.cs b/src/runtime/pythonexception.cs → src/runtime/PythonException.cs
diff --git a/src/runtime/pybuffer.cs → src/runtime/PythonTypes/PyBuffer.cs b/src/runtime/pybuffer.cs → src/runtime/PythonTypes/PyBuffer.cs
diff --git a/src/runtime/pydict.cs → src/runtime/PythonTypes/PyDict.cs b/src/runtime/pydict.cs → src/runtime/PythonTypes/PyDict.cs
diff --git a/src/runtime/pyfloat.cs → src/runtime/PythonTypes/PyFloat.cs b/src/runtime/pyfloat.cs → src/runtime/PythonTypes/PyFloat.cs
diff --git a/src/runtime/pyint.cs → src/runtime/PythonTypes/PyInt.cs b/src/runtime/pyint.cs → src/runtime/PythonTypes/PyInt.cs
diff --git a/src/runtime/pyiter.cs → src/runtime/PythonTypes/PyIter.cs b/src/runtime/pyiter.cs → src/runtime/PythonTypes/PyIter.cs
diff --git a/src/runtime/pyiterable.cs → src/runtime/PythonTypes/PyIterable.cs b/src/runtime/pyiterable.cs → src/runtime/PythonTypes/PyIterable.cs
diff --git a/src/runtime/pylist.cs → src/runtime/PythonTypes/PyList.cs b/src/runtime/pylist.cs → src/runtime/PythonTypes/PyList.cs
diff --git a/src/runtime/module.cs → src/runtime/PythonTypes/PyModule.cs b/src/runtime/module.cs → src/runtime/PythonTypes/PyModule.cs
diff --git a/src/runtime/pynumber.cs → src/runtime/PythonTypes/PyNumber.cs b/src/runtime/pynumber.cs → src/runtime/PythonTypes/PyNumber.cs
diff --git a/src/runtime/pyobject.cs → src/runtime/PythonTypes/PyObject.cs b/src/runtime/pyobject.cs → src/runtime/PythonTypes/PyObject.cs
diff --git a/src/runtime/pysequence.cs → src/runtime/PythonTypes/PySequence.cs b/src/runtime/pysequence.cs → src/runtime/PythonTypes/PySequence.cs
diff --git a/src/runtime/pystring.cs → src/runtime/PythonTypes/PyString.cs b/src/runtime/pystring.cs → src/runtime/PythonTypes/PyString.cs
diff --git a/src/runtime/pytuple.cs → src/runtime/PythonTypes/PyTuple.cs b/src/runtime/pytuple.cs → src/runtime/PythonTypes/PyTuple.cs
diff --git a/src/runtime/pytype.cs → src/runtime/PythonTypes/PyType.cs b/src/runtime/pytype.cs → src/runtime/PythonTypes/PyType.cs
diff --git a/src/runtime/TypeSpec.cs → src/runtime/PythonTypes/TypeSpec.cs b/src/runtime/TypeSpec.cs → src/runtime/PythonTypes/TypeSpec.cs
diff --git a/src/runtime/resources/clr.py → src/runtime/Resources/clr.py b/src/runtime/resources/clr.py → src/runtime/Resources/clr.py
diff --git a/src/runtime/resources/interop.py → src/runtime/Resources/interop.py b/src/runtime/resources/interop.py → src/runtime/Resources/interop.py