pythonnet · den-run-ai · Jan 16, 2016 · Feb 4, 2016 · Feb 14, 2016 · Feb 14, 2016
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ python:
   - 2.7
   - 3.2
   - 3.4
+  - 3.5
 before_install:
   - sudo apt-get install software-properties-common
   - sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ trusty main universe"

diff --git a/README.md b/README.md
@@ -3,9 +3,9 @@ pythonnet
 
 Python for .NET is a package that gives Python programmers nearly seamless integration with the .NET Common Language Runtime (CLR) and provides a powerful application scripting tool for .NET developers. It allows Python code to interact with the CLR, and may also be used to embed Python into a .NET application.
 
-[![Build Status](https://travis-ci.org/pythonnet/pythonnet.png?branch=master)](https://travis-ci.org/pythonnet/pythonnet)
+[![Build Status](https://travis-ci.org/denfromufa/pythonnet.png?branch=develop)](https://travis-ci.org/denfromufa/pythonnet)
 
-[![Build status](https://ci.appveyor.com/api/projects/status/c8k0miljb3n1c7be/branch/master)](https://ci.appveyor.com/project/TonyRoberts/pythonnet-480xs)
+[![Build status](https://ci.appveyor.com/api/projects/status/c8k0miljb3n1c7be/branch/master)](https://ci.appveyor.com/project/denfromufa/pythonnet)
 
 **Calling .NET code from Python**
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -4,31 +4,37 @@ environment:
   global:
     PYTHONPATH: c:\testdir
     PYTHONWARNINGS: 'ignore:::pip.pep425tags:'
-    PIPURL: https://bootstrap.pypa.io/get-pip.py
-
   matrix:
-  - pythonurl: http://www.python.org/ftp/python/2.7.6/python-2.7.6.amd64.msi
-  - pythonurl: http://www.python.org/ftp/python/2.7.6/python-2.7.6.msi
-  - pythonurl: http://www.python.org/ftp/python/3.3.5/python-3.3.5.msi
-  - pythonurl: http://www.python.org/ftp/python/3.3.5/python-3.3.5.amd64.msi 
-  - pythonurl: http://www.python.org/ftp/python/3.4.2/python-3.4.2.msi
-  - pythonurl: http://www.python.org/ftp/python/3.4.2/python-3.4.2.amd64.msi 
+
+    # For Python versions available on Appveyor, see
+    # http://www.appveyor.com/docs/installed-software#python
+    # The list here is complete (excluding Python 2.6, which
+    # isn't covered by this document) at the time of writing.
+
+    - PYTHON: "C:\\Python27"
+    - PYTHON: "C:\\Python33"
+    - PYTHON: "C:\\Python34"
+    - PYTHON: "C:\\Python35"
+    - PYTHON: "C:\\Python27-x64"
+    - PYTHON: "C:\\Python33-x64"
+      DISTUTILS_USE_SDK: "1"
+    - PYTHON: "C:\\Python34-x64"
+      DISTUTILS_USE_SDK: "1"
+    - PYTHON: "C:\\Python35-x64"
 
 install:
-  - ps: (new-object net.webclient).DownloadFile($env:pythonurl, 'C:\python.msi')
-  - ps: start-process -wait -FilePath msiexec.exe -ArgumentList '/qn /x C:\python.msi TARGETDIR=C:\Python'
-  - ps: start-process -wait -FilePath msiexec.exe -ArgumentList '/qn /i C:\python.msi TARGETDIR=C:\Python'
-  - ps: (new-object net.webclient).DownloadFile($env:PIPURL, 'C:\get-pip.py')
-  - C:\Python\python.exe --version
-  - C:\Python\python.exe c:\get-pip.py
-  - C:\Python\Scripts\pip.exe install wheel
-  - C:\Python\Scripts\pip.exe install six
+# We need wheel installed to build wheels
+- "%PYTHON%\\python -m pip install --upgrade pip"
+- "%PYTHON%\\python.exe -m pip install wheel"
+- "%PYTHON%\\python.exe -m pip install six"
 
 build_script:
-  - C:\python\python.exe setup.py bdist_wheel
+- "%PYTHON%\\python.exe setup.py bdist_wheel"
 
 test_script:
-  - ps: C:\Python\Scripts\pip.exe install --no-cache-dir --force-reinstall --ignore-installed ('dist\' + (gci dist)[0].Name)
+  - cd "%PYTHON%"
+  - ps: Scripts\pip.exe install --no-cache-dir --force-reinstall --ignore-installed ('C:\\projects\\pythonnet\\dist\\' + (gci C:\projects\pythonnet\dist)[0].Name)
+  - cd C:\projects\pythonnet
   - mkdir c:\testdir
   - ps: copy-item (gci -path build -re -include Python.Test.dll)[0].FullName c:\testdir
-  - c:\python\python.exe src\tests\runtests.py
+  - "%PYTHON%\\python.exe src\\tests\\runtests.py"
diff --git a/setup.py b/setup.py
@@ -40,6 +40,18 @@ def _find_msbuild_tool(tool="msbuild.exe", use_windows_sdk=False):
                 locappdir, vcpy27, r"x64\mt.exe")
             if os.path.exists(mtpath):
                 return mtpath      
+        if sys.version_info[:2] == (3,5):
+            vcpy35 = (r"C:\Program Files (x86)\Windows Kits\8.1\bin")
+            if PLATFORM == "x86":
+                mtpath = os.path.join(
+                vcpy35, r"x86\mt.exe")
+            elif PLATFORM == "x64":
+                mtpath = os.path.join(
+                vcpy35, r"x64\mt.exe")
+            if os.path.exists(mtpath):
+                return mtpath
+            else:
+                print (mtpath)
         value_name = "InstallationFolder"
         sdk_name = "Windows SDK"
         keys_to_check = [
@@ -304,6 +316,7 @@ def _check_output(*popenargs, **kwargs):
             'Programming Language :: Python :: 3.2',
             'Programming Language :: Python :: 3.3',
             'Programming Language :: Python :: 3.4',
+            'Programming Language :: Python :: 3.5',
             'Programming Language :: C#',
             'License :: OSI Approved :: Zope Public License',
             'Development Status :: 5 - Production/Stable',

diff --git a/src/clrmodule/ClrModule.cs b/src/clrmodule/ClrModule.cs
@@ -39,7 +39,7 @@ public class clrModule
 // ReSharper restore CheckNamespace
 {
 // ReSharper disable InconsistentNaming
-#if (PYTHON32 || PYTHON33 || PYTHON34)
+#if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
     [RGiesecke.DllExport.DllExport("PyInit_clr", System.Runtime.InteropServices.CallingConvention.StdCall)]
     public static IntPtr PyInit_clr()
 #else
@@ -107,7 +107,7 @@ public static void initclr()
 #if DEBUG_PRINT
                 System.Console.WriteLine("Could not load Python.Runtime, so sad.");
 #endif
-#if (PYTHON32 || PYTHON33 || PYTHON34)
+#if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
                 return IntPtr.Zero;
 #else
                 return;
@@ -119,7 +119,7 @@ public static void initclr()
 		// So now we get the PythonEngine and execute the InitExt method on it.
         var pythonEngineType = pythonRuntime.GetType("Python.Runtime.PythonEngine");
 
-#if (PYTHON32 || PYTHON33 || PYTHON34)
+#if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
         return (IntPtr)pythonEngineType.InvokeMember("InitExt", System.Reflection.BindingFlags.InvokeMethod, null, null, null);
 #else
         pythonEngineType.InvokeMember("InitExt", System.Reflection.BindingFlags.InvokeMethod, null, null, null);

diff --git a/src/runtime/classbase.cs b/src/runtime/classbase.cs
@@ -57,7 +57,7 @@ public virtual IntPtr type_subscript(IntPtr idx) {
         //====================================================================
         // Standard comparison implementation for instances of reflected types.
         //====================================================================
-#if (PYTHON32 || PYTHON33 || PYTHON34)
+#if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
         public static IntPtr tp_richcompare(IntPtr ob, IntPtr other, int op) {
             if (op != Runtime.Py_EQ && op != Runtime.Py_NE)
             {

diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
@@ -405,7 +405,7 @@ static bool ToPrimitive(IntPtr value, Type obType, out Object result,
                 return true;
 
             case TypeCode.Int32:
-#if !(PYTHON32 || PYTHON33 || PYTHON34)
+#if !(PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
                 // Trickery to support 64-bit platforms.
                 if (IntPtr.Size == 4) {
                     op = Runtime.PyNumber_Int(value);
@@ -456,7 +456,7 @@ static bool ToPrimitive(IntPtr value, Type obType, out Object result,
                 return true;
 
             case TypeCode.Byte:
-#if (PYTHON32 || PYTHON33 || PYTHON34)
+#if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
                 if (Runtime.PyObject_TypeCheck(value, Runtime.PyBytesType))
                 {
                     if (Runtime.PyBytes_Size(value) == 1)
@@ -496,7 +496,7 @@ static bool ToPrimitive(IntPtr value, Type obType, out Object result,
                 return true;
 
             case TypeCode.SByte:
-#if (PYTHON32 || PYTHON33 || PYTHON34)
+#if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
                 if (Runtime.PyObject_TypeCheck(value, Runtime.PyBytesType)) {
                     if (Runtime.PyBytes_Size(value) == 1) {
                         op = Runtime.PyBytes_AS_STRING(value);
@@ -534,7 +534,7 @@ static bool ToPrimitive(IntPtr value, Type obType, out Object result,
                 return true;
 
             case TypeCode.Char:
-#if (PYTHON32 || PYTHON33 || PYTHON34)
+#if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
                 if (Runtime.PyObject_TypeCheck(value, Runtime.PyBytesType)) {
                     if (Runtime.PyBytes_Size(value) == 1) {
                         op = Runtime.PyBytes_AS_STRING(value);

diff --git a/src/runtime/delegateobject.cs b/src/runtime/delegateobject.cs
@@ -103,7 +103,7 @@ public static IntPtr tp_call(IntPtr ob, IntPtr args, IntPtr kw) {
         //====================================================================
         // Implements __cmp__ for reflected delegate types.
         //====================================================================
-#if (PYTHON32 || PYTHON33 || PYTHON34)
+#if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
         public static new IntPtr tp_richcompare(IntPtr ob, IntPtr other, int op) {
             if (op != Runtime.Py_EQ && op != Runtime.Py_NE)
             {

diff --git a/src/runtime/exceptions.cs b/src/runtime/exceptions.cs
@@ -31,7 +31,7 @@ internal class ExceptionClassObject : ClassObject {
         internal ExceptionClassObject(Type tp) : base(tp) {
         }
 
-#if (PYTHON25 || PYTHON26 || PYTHON27 || PYTHON32 || PYTHON33 || PYTHON34)
+#if (PYTHON25 || PYTHON26 || PYTHON27 || PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
         internal static Exception ToException(IntPtr ob) {
             CLRObject co = GetManagedObject(ob) as CLRObject;
             if (co == null) {
@@ -114,7 +114,7 @@ public static IntPtr tp_getattro(IntPtr ob, IntPtr key)
 
             return Runtime.PyObject_GenericGetAttr(ob, key);
         }
-#endif      // (PYTHON25 || PYTHON26 || PYTHON27 || PYTHON32 || PYTHON33 || PYTHON34)
+#endif      // (PYTHON25 || PYTHON26 || PYTHON27 || PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
     }
 
     /// <summary>
@@ -136,7 +136,7 @@ private Exceptions() {}
         //===================================================================
 
         internal static void Initialize() {
-#if (PYTHON32 || PYTHON33 || PYTHON34)
+#if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
             exceptions_module = Runtime.PyImport_ImportModule("builtins");
 #else
             exceptions_module = Runtime.PyImport_ImportModule("exceptions");
@@ -572,15 +572,15 @@ internal static IntPtr RaiseTypeError(string message) {
            puplic static variables on the Exceptions class filled in from
            the python class using reflection in Initialize() looked up by
 		   name, not posistion. */
-#if (PYTHON25 || PYTHON26 || PYTHON27 || PYTHON32 || PYTHON33 || PYTHON34)
+#if (PYTHON25 || PYTHON26 || PYTHON27 || PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
         public static IntPtr BaseException;
 #endif
         public static IntPtr Exception;
         public static IntPtr StopIteration;
-#if (PYTHON25 || PYTHON26 || PYTHON27 || PYTHON32 || PYTHON33 || PYTHON34)
+#if (PYTHON25 || PYTHON26 || PYTHON27 || PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
         public static IntPtr GeneratorExit;
 #endif
-#if !(PYTHON32 || PYTHON33 || PYTHON34)
+#if !(PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
         public static IntPtr StandardError;
 #endif
         public static IntPtr ArithmeticError;
@@ -637,7 +637,7 @@ puplic static variables on the Exceptions class filled in from
         public static IntPtr SyntaxWarning;
         public static IntPtr RuntimeWarning;
         public static IntPtr FutureWarning;
-#if (PYTHON25 || PYTHON26 || PYTHON27 || PYTHON32 || PYTHON33 || PYTHON34)
+#if (PYTHON25 || PYTHON26 || PYTHON27 || PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
         public static IntPtr ImportWarning;
         public static IntPtr UnicodeWarning;
         //PyAPI_DATA(PyObject *) PyExc_BytesWarning;

diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -23,7 +23,7 @@ internal class ImportHook {
         static CLRModule root;
         static MethodWrapper hook;
 
-#if (PYTHON32 || PYTHON33 || PYTHON34)
+#if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
         static IntPtr py_clr_module;
         static IntPtr module_def;
 #endif
@@ -38,7 +38,7 @@ internal static void Initialize() {
             // but it provides the most "Pythonic" way of dealing with CLR
             // modules (Python doesn't provide a way to emulate packages).
             IntPtr dict = Runtime.PyImport_GetModuleDict();
-#if (PYTHON32 || PYTHON33 || PYTHON34)
+#if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
             IntPtr mod = Runtime.PyImport_ImportModule("builtins");
             py_import = Runtime.PyObject_GetAttrString(mod, "__import__");
 #else
@@ -51,10 +51,15 @@ internal static void Initialize() {
 
             root = new CLRModule();
 
-#if (PYTHON32 || PYTHON33 || PYTHON34)
+#if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
             // create a python module with the same methods as the clr module-like object
             module_def = ModuleDefOffset.AllocModuleDef("clr");
+
+#if (Py_TRACE_REFS && PYTHON35)
+            py_clr_module = Runtime.PyModule_FromDefAndSpec2(module_def, (IntPtr)null, 3);
+#else
             py_clr_module = Runtime.PyModule_Create2(module_def, 3);
+#endif
 
             // both dicts are borrowed references
             IntPtr mod_dict = Runtime.PyModule_GetDict(py_clr_module);
@@ -78,7 +83,7 @@ internal static void Initialize() {
         //===================================================================
 
         internal static void Shutdown() {
-#if (PYTHON32 || PYTHON33 || PYTHON34)
+#if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
             if (0 != Runtime.Py_IsInitialized()) {
                 Runtime.Decref(py_clr_module);
                 Runtime.Decref(root.pyHandle);
@@ -100,7 +105,7 @@ internal static void Shutdown() {
         //===================================================================
         public static IntPtr GetCLRModule(IntPtr? fromList=null) {
             root.InitializePreload();
-#if (PYTHON32 || PYTHON33 || PYTHON34)
+#if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
             // update the module dictionary with the contents of the root dictionary
             root.LoadNames();
             IntPtr py_mod_dict = Runtime.PyModule_GetDict(py_clr_module);
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ python: @@
       - 2.7
       - 3.2
       - 3.4
+      - 3.5
     before_install:
       - sudo apt-get install software-properties-common
       - sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ trusty main universe"
@@ Expand Down @@