Python 3.4 compatibility

Author: pyscripter

PythonForDelphi/Components/Python_XE7.dpk

@@ -0,0 +1,42 @@
+package Python_XE7;
+
+{$R *.res}
+{$R 'Sources\Core\PythonEngine.dcr'}
+{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
+{$ALIGN 8}
+{$ASSERTIONS ON}
+{$BOOLEVAL OFF}
+{$DEBUGINFO ON}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS ON}
+{$LOCALSYMBOLS ON}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION OFF}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO ON}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES ON}
+{$TYPEDADDRESS OFF}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST OFF}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $400000}
+{$DEFINE DEBUG}
+{$ENDIF IMPLICITBUILDING}
+{$DESCRIPTION 'Components for Python'}
+{$IMPLICITBUILD OFF}
+
+requires
+  rtl,
+  vcl;
+
+contains
+  MethodCallBack in 'Sources\Core\MethodCallBack.pas',
+  PythonEngine in 'Sources\Core\PythonEngine.pas',
+  PythonGUIInputOutput in 'Sources\Core\PythonGUIInputOutput.pas',
+  WrapDelphi in 'Sources\Core\WrapDelphi.pas';
+
+end.

PythonForDelphi/Components/Sources/Core/PythonEngine.pas

@@ -126,7 +126,7 @@ interface
   end;
 const
 {$IFDEF MSWINDOWS}
-  PYTHON_KNOWN_VERSIONS: array[1..9] of TPythonVersionProp =
+  PYTHON_KNOWN_VERSIONS: array[1..10] 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),
@@ -135,10 +135,11 @@ interface
     (DllName: 'python30.dll'; RegVersion: '3.0'; APIVersion: 1013; CanUseLatest: True),
     (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: 'python33.dll'; RegVersion: '3.3'; APIVersion: 1013; CanUseLatest: True),
+    (DllName: 'python34.dll'; RegVersion: '3.4'; APIVersion: 1013; CanUseLatest: True) );
 {$ENDIF}
 {$IFDEF LINUX}
-  PYTHON_KNOWN_VERSIONS: array[1..9] of TPythonVersionProp =
+  PYTHON_KNOWN_VERSIONS: array[1..10] 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),
@@ -147,7 +148,8 @@ interface
     (DllName: 'libpython3.0.so'; RegVersion: '3.0'; APIVersion: 1013; CanUseLatest: True),
     (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.3.so'; RegVersion: '3.3'; APIVersion: 1013; CanUseLatest: True),
+    (DllName: 'libpython3.4.so'; RegVersion: '3.4'; APIVersion: 1013; CanUseLatest: True) );
 {$ENDIF}
 {$IFDEF PYTHON23}
   COMPILED_FOR_PYTHON_VERSION_INDEX = 1;
@@ -176,7 +178,9 @@ interface
 {$IFDEF PYTHON33}
   COMPILED_FOR_PYTHON_VERSION_INDEX = 9;
 {$ENDIF}
-
+{$IFDEF PYTHON34}
+  COMPILED_FOR_PYTHON_VERSION_INDEX = 10;
+{$ENDIF}
   PYT_METHOD_BUFFER_INCREASE = 10;
   PYT_MEMBER_BUFFER_INCREASE = 10;
   PYT_GETSET_BUFFER_INCREASE = 10;
@@ -1704,6 +1708,7 @@   TPythonInterface=class(TDynamicDll)
     PySys_SetArgv3000:    procedure( argc: Integer; argv: PPWideChar); cdecl;
 
     PyCFunction_New: function(md:PPyMethodDef;ob:PPyObject):PPyObject; cdecl;
+    PyCFunction_NewEx: function(md:PPyMethodDef;self, ob:PPyObject):PPyObject; cdecl;
 // Removed.  Use PyEval_CallObjectWithKeywords with third argument nil
 //    PyEval_CallObject: function(callable_obj, args:PPyObject):PPyObject; cdecl;
     PyEval_CallObjectWithKeywords:function (callable_obj, args, kw:PPyObject):PPyObject; cdecl;
@@ -3752,7 +3757,12 @@ procedure TPythonInterface.MapDll;
     PySys_SetArgv3000         := Import('PySys_SetArgv');
   Py_Exit                   := Import('Py_Exit');
 
-  PyCFunction_New           :=Import('PyCFunction_New');
+  if IsPython3000 then
+    PyCFunction_NewEx           :=Import('PyCFunction_NewEx')
+  else
+    PyCFunction_New           :=Import('PyCFunction_New');
+
+
   PyEval_CallObjectWithKeywords:=Import('PyEval_CallObjectWithKeywords');
   PyEval_GetFrame           :=Import('PyEval_GetFrame');
   PyEval_GetGlobals         :=Import('PyEval_GetGlobals');
@@ -8915,7 +8925,10 @@ procedure TPythonType.AddTypeVar;
       FCreateFuncDef.ml_meth  := GetOfObjectCallBack( TCallBack(meth), 2, ctCDECL);
       FCreateFuncDef.ml_flags := METH_VARARGS;
       FCreateFuncDef.ml_doc   := PAnsiChar(FCreateFuncDoc);
-      FCreateFunc := Engine.PyCFunction_New(@FCreateFuncDef, nil);
+      if GetPythonEngine.IsPython3000 then
+        FCreateFunc := Engine.PyCFunction_NewEx(@FCreateFuncDef, nil, nil)
+      else
+        FCreateFunc := Engine.PyCFunction_New(@FCreateFuncDef, nil);
     end;
     Assert(Assigned(FCreateFunc));
   end;

PythonForDelphi/Components/Sources/Core/WrapDelphi.pas

@@ -2689,7 +2689,10 @@ procedure TPyDelphiWrapper.CreatePyFunc(AModule: TPythonModule; AMethodDef: PPyM
     begin
       d := PyModule_GetDict(FModule.Module);
       Assert(Assigned(d));
-      PyDict_SetItemString( d, AMethodDef^.ml_name, PyCFunction_New(AMethodDef, nil));
+      if IsPython3000 then
+        PyDict_SetItemString( d, AMethodDef^.ml_name, PyCFunction_NewEx(AMethodDef, nil, nil))
+      else
+        PyDict_SetItemString( d, AMethodDef^.ml_name, PyCFunction_New(AMethodDef, nil));
     end;
 end;