Aug 25, 2021 · Aug 25, 2021
diff --git a/src/embed_tests/TestFinalizer.cs b/src/embed_tests/TestFinalizer.cs
            bool oldState = Finalizer.Instance.Enable;
            try
            {
                using (PyModule gcModule = PyModule.Import("gc"))
                using (PyObject gcModule = PyModule.Import("gc"))
                using (PyObject pyCollect = gcModule.GetAttr("collect"))
                {
                    long span1 = CompareWithFinalizerOn(pyCollect, false);
diff --git a/src/embed_tests/TestPyModule.cs b/src/embed_tests/TestPyModule.cs

 using System;

 using NUnit.Framework;

 using Python.Runtime;
            Assert.IsTrue(scope.TryGet("x", out dynamic x));
            Assert.AreEqual("True", x.ToString());
        }

        [Test]
        public void ImportClrNamespace()
        {
            Py.Import(typeof(TestPyModule).Namespace);
        }
    }
 }
diff --git a/src/runtime/exceptions.cs b/src/runtime/exceptions.cs
    /// </remarks>
    internal static class Exceptions
    {
        internal staticPyModule warnings_module;
        internal staticPyModule exceptions_module;
        internal staticPyObject warnings_module;
        internal staticPyObject exceptions_module;

        /// <summary>
        /// Initialization performed on startup of the Python runtime.
diff --git a/src/runtime/pymodule.cs b/src/runtime/pymodule.cs
 using System;
 using System.Text;

 using Python.Runtime.Native;

 namespace Python.Runtime
 {
        public PyModule(string name, string filename = null) : this(Create(name, filename)) { }

        /// <summary>
        /// Given a module or package name, import the
        /// module and return the resulting module object as a <see cref="PyModule"/>.
        /// Given a module or package name, import the module and return the resulting object.
        /// </summary>
        /// <param name="name">Fully-qualified module or package name</param>
        public staticPyModule Import(string name)
        public staticPyObject Import(string name)
        {
            NewReference op = Runtime.PyImport_ImportModule(name);
            PythonException.ThrowIfIsNull(op);
            return new PyModule(ref op);
            returnIsModule(op) ?new PyModule(ref op) : op.MoveToPyObject();
        }

        /// <summary>
                return new PyDict(sysModulesRef);
            }
        }

        internal static bool IsModule(BorrowedReference reference)
        {
            if (reference == null) return false;
            BorrowedReference type = Runtime.PyObject_TYPE(reference);
            return Runtime.PyType_IsSubtype(type, Runtime.PyModuleType);
        }
    }
 }
diff --git a/src/runtime/pyscope.cs b/src/runtime/pyscope.cs
        /// <summary>Create a scope based on a Python Module.</summary>
        private PyScope(IntPtr ptr, PyScopeManager manager) : base(ptr)
        {
            if (!Runtime.PyType_IsSubtype(Runtime.PyObject_TYPE(Reference), Runtime.PyModuleType))
            if (!PyModule.IsModule(Reference))
            {
                throw new PyScopeException("object is not a module");
            }
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
        }

        /// <summary>
        /// Given a module or package name, import the
        /// module and return the resulting module object as a <see cref="PyModule"/>.
        /// Given a module or package name, import the module and return the resulting object.
        /// </summary>
        /// <param name="name">Fully-qualified module or package name</param>
        public staticPyModule Import(string name) => PyModule.Import(name);
        public staticPyObject Import(string name) => PyModule.Import(name);

        public static void SetArgv()
        {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -183,7 +183,7 @@ public void SimpleTestMemory()
		bool oldState = Finalizer.Instance.Enable;
		try
		{
		using (PyModule gcModule = PyModule.Import("gc"))
		using (PyObject gcModule = PyModule.Import("gc"))
		using (PyObject pyCollect = gcModule.GetAttr("collect"))
		{
		long span1 = CompareWithFinalizerOn(pyCollect, false);
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,3 @@

		using System;

		using NUnit.Framework;

		using Python.Runtime;
Expand DownExpand Up		@@ -43,5 +40,11 @@ public void TestCreate()
		Assert.IsTrue(scope.TryGet("x", out dynamic x));
		Assert.AreEqual("True", x.ToString());
		}

		[Test]
		public void ImportClrNamespace()
		{
		Py.Import(typeof(TestPyModule).Namespace);
		}
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -87,8 +87,8 @@ internal static Exception ToException(BorrowedReference ob)
		/// </remarks>
		internal static class Exceptions
		{
		internal staticPyModule warnings_module;
		internal staticPyModule exceptions_module;
		internal staticPyObject warnings_module;
		internal staticPyObject exceptions_module;

		/// <summary>
		/// Initialization performed on startup of the Python runtime.
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,7 +1,4 @@
		using System;
		using System.Text;

		using Python.Runtime.Native;

		namespace Python.Runtime
		{
Expand All		@@ -12,15 +9,14 @@ public PyModule(PyObject o) : base(o.Reference, PyScopeManager.Global) { }
		public PyModule(string name, string filename = null) : this(Create(name, filename)) { }

		/// <summary>
		/// Given a module or package name, import the
		/// module and return the resulting module object as a <see cref="PyModule"/>.
		/// Given a module or package name, import the module and return the resulting object.
		/// </summary>
		/// <param name="name">Fully-qualified module or package name</param>
		public staticPyModule Import(string name)
		public staticPyObject Import(string name)
		{
		NewReference op = Runtime.PyImport_ImportModule(name);
		PythonException.ThrowIfIsNull(op);
		return new PyModule(ref op);
		returnIsModule(op) ?new PyModule(ref op) : op.MoveToPyObject();
		}

		/// <summary>
Expand DownExpand Up		@@ -85,5 +81,12 @@ public static PyDict SysModules
		return new PyDict(sysModulesRef);
		}
		}

		internal static bool IsModule(BorrowedReference reference)
		{
		if (reference == null) return false;
		BorrowedReference type = Runtime.PyObject_TYPE(reference);
		return Runtime.PyType_IsSubtype(type, Runtime.PyModuleType);
		}
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -56,7 +56,7 @@ internal PyScope(BorrowedReference reference, PyScopeManager manager)
		/// <summary>Create a scope based on a Python Module.</summary>
		private PyScope(IntPtr ptr, PyScopeManager manager) : base(ptr)
		{
		if (!Runtime.PyType_IsSubtype(Runtime.PyObject_TYPE(Reference), Runtime.PyModuleType))
		if (!PyModule.IsModule(Reference))
		{
		throw new PyScopeException("object is not a module");
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -750,11 +750,10 @@ public static KeywordArguments kw(params object[] kv)
		}

		/// <summary>
		/// Given a module or package name, import the
		/// module and return the resulting module object as a <see cref="PyModule"/>.
		/// Given a module or package name, import the module and return the resulting object.
		/// </summary>
		/// <param name="name">Fully-qualified module or package name</param>
		public staticPyModule Import(string name) => PyModule.Import(name);
		public staticPyObject Import(string name) => PyModule.Import(name);

		public static void SetArgv()
		{
Expand Down