Merge branch 'master' of https://github.com/cutec-chris/python4delphi

cutec-chris · cutec-chris · commit 331c1d7a0099 · 2015-10-06T17:33:36.000+02:00
diff --git a/PythonForDelphi/Components/Sources/Core/Definition.Inc b/PythonForDelphi/Components/Sources/Core/Definition.Inc
@@ -36,6 +36,7 @@
 //{$DEFINE PYTHON32}
 //{$DEFINE PYTHON33}
 //{$DEFINE PYTHON34}
+//{$DEFINE PYTHON35}
 
 /////////////////////////////////////////////////////////////////////////////
 // Python for Delphi settings. Comment out the setting you want to enable.
@@ -322,19 +323,21 @@
 // Note that the installer will let the user specify its default Python version, and
 // thus will edit this file.
 
-{$IFNDEF PYTHON34}
-  {$IFNDEF PYTHON33}
-    {$IFNDEF PYTHON32}
-      {$IFNDEF PYTHON31}
-        {$IFNDEF PYTHON30}
-          {$IFNDEF PYTHON27}
-            {$IFNDEF PYTHON26}
-              {$IFNDEF PYTHON25}
-                {$IFNDEF PYTHON24}
-                  {$IFNDEF PYTHON23}
-            {---<START OF DEFAULT PYTHON VERSION>---}
-                {$DEFINE PYTHON27}
-            {---<END OF DEFAULT PYTHON VERSION>---}
+{$IFNDEF PYTHON35}
+  {$IFNDEF PYTHON34}
+    {$IFNDEF PYTHON33}
+      {$IFNDEF PYTHON32}
+        {$IFNDEF PYTHON31}
+          {$IFNDEF PYTHON30}
+            {$IFNDEF PYTHON27}
+              {$IFNDEF PYTHON26}
+                {$IFNDEF PYTHON25}
+                  {$IFNDEF PYTHON24}
+                    {$IFNDEF PYTHON23}
+              {---<START OF DEFAULT PYTHON VERSION>---}
+                  {$DEFINE PYTHON27}
+              {---<END OF DEFAULT PYTHON VERSION>---}
+                    {$ENDIF}
                   {$ENDIF}
                 {$ENDIF}
               {$ENDIF}
diff --git a/PythonForDelphi/Components/Sources/Core/PythonEngine.pas b/PythonForDelphi/Components/Sources/Core/PythonEngine.pas
@@ -126,7 +126,7 @@ interface
   end;
 const
 {$IFDEF MSWINDOWS}
-  PYTHON_KNOWN_VERSIONS: array[1..10] of TPythonVersionProp =
+  PYTHON_KNOWN_VERSIONS: array[1..12] of TPythonVersionProp =
   ( (DllName: 'python23.dll'; RegVersion: '2.3'; APIVersion: 1012; CanUseLatest: True),
     (DllName: 'python24.dll'; RegVersion: '2.4'; APIVersion: 1012; CanUseLatest: True),
     (DllName: 'python25.dll'; RegVersion: '2.5'; APIVersion: 1013; CanUseLatest: True),
@@ -136,10 +136,12 @@ interface
     (DllName: 'python31.dll'; RegVersion: '3.1'; APIVersion: 1013; CanUseLatest: True),
     (DllName: 'python32.dll'; RegVersion: '3.2'; APIVersion: 1013; CanUseLatest: True),
     (DllName: 'python33.dll'; RegVersion: '3.3'; APIVersion: 1013; CanUseLatest: True),
-    (DllName: 'python34.dll'; RegVersion: '3.4'; APIVersion: 1013; CanUseLatest: True) );
+    (DllName: 'python34.dll'; RegVersion: '3.4'; APIVersion: 1013; CanUseLatest: True),
+    (DllName: 'python35.dll'; RegVersion: '3.5-32'; APIVersion: 1013; CanUseLatest: True),
+    (DllName: 'python35.dll'; RegVersion: '3.5-64'; APIVersion: 1013; CanUseLatest: True) );
 {$ENDIF}
 {$IFDEF LINUX}
-  PYTHON_KNOWN_VERSIONS: array[1..10] of TPythonVersionProp =
+  PYTHON_KNOWN_VERSIONS: array[1..11] of TPythonVersionProp =
   ( (DllName: 'libpython2.3.so'; RegVersion: '2.3'; APIVersion: 1012; CanUseLatest: True),
     (DllName: 'libpython2.4.so'; RegVersion: '2.4'; APIVersion: 1012; CanUseLatest: True),
     (DllName: 'libpython2.5.so'; RegVersion: '2.5'; APIVersion: 1013; CanUseLatest: True),
@@ -149,7 +151,8 @@ interface
     (DllName: 'libpython3.1.so'; RegVersion: '3.1'; APIVersion: 1013; CanUseLatest: True),
     (DllName: 'libpython3.2.so'; RegVersion: '3.2'; APIVersion: 1013; CanUseLatest: True),
     (DllName: 'libpython3.3.so'; RegVersion: '3.3'; APIVersion: 1013; CanUseLatest: True),
-    (DllName: 'libpython3.4.so'; RegVersion: '3.4'; APIVersion: 1013; CanUseLatest: True) );
+    (DllName: 'libpython3.4.so'; RegVersion: '3.4'; APIVersion: 1013; CanUseLatest: True),
+    (DllName: 'libpython3.5.so'; RegVersion: '3.5'; APIVersion: 1013; CanUseLatest: True) );
 {$ENDIF}
 {$IFDEF PYTHON23}
   COMPILED_FOR_PYTHON_VERSION_INDEX = 1;
@@ -180,6 +183,9 @@ interface
 {$ENDIF}
 {$IFDEF PYTHON34}
   COMPILED_FOR_PYTHON_VERSION_INDEX = 10;
+{$ENDIF}
+{$IFDEF PYTHON35}
+  COMPILED_FOR_PYTHON_VERSION_INDEX = 11;
 {$ENDIF}
   PYT_METHOD_BUFFER_INCREASE = 10;
   PYT_MEMBER_BUFFER_INCREASE = 10;
@@ -4693,7 +4699,11 @@ procedure TPythonEngine.DoOpenDll(const aDllName : String);
     for i:= Integer(COMPILED_FOR_PYTHON_VERSION_INDEX) to High(PYTHON_KNOWN_VERSIONS) do
     begin
       RegVersion := PYTHON_KNOWN_VERSIONS[i].RegVersion;
-      FDLLHandle := SafeLoadLibrary(GetDllPath+PYTHON_KNOWN_VERSIONS[i].DllName);
+      try
+        FDLLHandle := SafeLoadLibrary(GetDllPath+PYTHON_KNOWN_VERSIONS[i].DllName);
+      except
+        FDLLHandle:=0;
+      end;
       if IsHandleValid then
       begin
         DllName := PYTHON_KNOWN_VERSIONS[i].DllName;
