Feb 24, 2017 · Feb 24, 2017
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs

        public static void Initialize()
        {
            Initialize(Enumerable.Empty<string>());
            Initialize(setSysArgv: true);
        }

        public static void Initialize(bool setSysArgv = true)
        {
            Initialize(Enumerable.Empty<string>(), setSysArgv: setSysArgv);
        }

        /// <summary>
        /// first call. It is *not* necessary to hold the Python global
        /// interpreter lock (GIL) to call this method.
        /// </remarks>
        public static void Initialize(IEnumerable<string> args)
        public static void Initialize(IEnumerable<string> args, bool setSysArgv = true)
        {
            if (!initialized)
            {
                initialized = true;
                Exceptions.Clear();

                Py.SetArgv(args);
                if (setSysArgv)
                    Py.SetArgv(args);

                // register the atexit callback (this doesn't use Py_AtExit as the C atexit
                // callbacks are called after python is fully finalized but the python ones
        {
            try
            {
                Initialize();
                Initialize(setSysArgv: false);

                // Trickery - when the import hook is installed into an already
                // running Python, the standard import machinery is still in
diff --git a/src/tests/test_sysargv.py b/src/tests/test_sysargv.py

 import sys

 import pytest

 from ._compat import check_output


 @pytest.mark.xfail(reason="argv being reset on import clr. See gh#404")
 def test_sys_argv_state(filepath):
    """Test sys.argv state doesn't change after clr import.
    To better control the arguments being passed, test on a fresh python
Original file line number	Diff line number	Diff line change
Expand Up		@@ -122,7 +122,12 @@ public static int RunSimpleString(string code)

		public static void Initialize()
		{
		Initialize(Enumerable.Empty<string>());
		Initialize(setSysArgv: true);
		}

		public static void Initialize(bool setSysArgv = true)
		{
		Initialize(Enumerable.Empty<string>(), setSysArgv: setSysArgv);
		}

		/// <summary>
Expand All		@@ -134,7 +139,7 @@ public static void Initialize()
		/// first call. It is not necessary to hold the Python global
		/// interpreter lock (GIL) to call this method.
		/// </remarks>
		public static void Initialize(IEnumerable<string> args)
		public static void Initialize(IEnumerable<string> args, bool setSysArgv = true)
		{
		if (!initialized)
		{
Expand All		@@ -148,7 +153,8 @@ public static void Initialize(IEnumerable<string> args)
		initialized = true;
		Exceptions.Clear();

		Py.SetArgv(args);
		if (setSysArgv)
		Py.SetArgv(args);

		// register the atexit callback (this doesn't use Py_AtExit as the C atexit
		// callbacks are called after python is fully finalized but the python ones
Expand DownExpand Up		@@ -213,7 +219,7 @@ public static void InitExt()
		{
		try
		{
		Initialize();
		Initialize(setSysArgv: false);

		// Trickery - when the import hook is installed into an already
		// running Python, the standard import machinery is still in
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,12 +4,9 @@

		import sys

		import pytest

		from ._compat import check_output


		@pytest.mark.xfail(reason="argv being reset on import clr. See gh#404")
		def test_sys_argv_state(filepath):
		"""Test sys.argv state doesn't change after clr import.
		To better control the arguments being passed, test on a fresh python
Expand Down