sync 3 units with P4D

Author: Alexey-T

python4lazarus/PythonAction.pas

@@ -124,7 +124,7 @@ function TPythonAction.PythonClear(pself, args: PPyObject): PPyObject;
   ClearMethods;
   with GetPythonEngine, RegisteredMethods do
     begin
-      Result := PyInt_FromLong(Count);
+      Result := PyLong_FromLong(Count);
     end;
 end;
 
@@ -146,7 +146,7 @@ function TPythonAction.PythonRegister(pself, args: PPyObject): PPyObject;
         begin
           Py_XINCREF(func);
           Add(func);
-          Result := PyInt_FromLong(Count);
+          Result := PyLong_FromLong(Count);
         end;
 end;
 
@@ -168,7 +168,7 @@ function TPythonAction.PythonUnregister(pself, args: PPyObject): PPyObject;
         begin
           Py_XDECREF(func);
           Remove(func);
-          Result := PyInt_FromLong(Count);
+          Result := PyLong_FromLong(Count);
         end;
 end;
 

python4lazarus/PythonVersions.pas

@@ -57,8 +57,7 @@   TPythonVersion = record
     The function result has the semantics of Delphi compare functions
     -1: A is bigger (newer), 0: equal versions, 1: B is bigger (newer)
   *)
-  function  CompareVersions(A, B : string) : Integer;
-
+  function CompareVersions(A, B : string) : Integer;
 
   {$IFDEF MSWINDOWS}
   (* Checks whether an executable was compiled for X64 *)
@@ -69,11 +68,14 @@   TPythonVersion = record
   function GetRegisteredPythonVersion(SysVersion: string;
     out PythonVersion: TPythonVersion): Boolean;
   (* Returns all registered Python versions *)
-  function GetRegisteredPythonVersions : TPythonVersions;
+  function GetRegisteredPythonVersions(const MinVersion: string = '0.0';
+    const MaxVersion: string = '100.100'): TPythonVersions;
   (* Returns the highest numbered registered Python version *)
-  function GetLatestRegisteredPythonVersion(out PythonVersion: TPythonVersion): Boolean;
+  function GetLatestRegisteredPythonVersion(out PythonVersion: TPythonVersion;
+    const MinVersion: string = '0.0'; const MaxVersion: string = '100.100'): Boolean;
   function PythonVersionFromPath(const Path: string; out PythonVersion: TPythonVersion;
-     AcceptVirtualEnvs: Boolean = True): Boolean;
+    AcceptVirtualEnvs: Boolean = True; const MinVersion: string = '0.0';
+    const MaxVersion: string = '100.100'): Boolean;
   {$ENDIF}
 
 implementation
@@ -92,7 +94,9 @@ implementation
 function TPythonVersion.GetDLLName: string;
 begin
   {$IFDEF MSWINDOWS}
-  Result := 'python' + SysVersion[1] + SysVersion[3] + '.dll';
+  Result := SysVersion;
+  Delete(Result, 2, 1);
+  Result := 'python' + Result + '.dll';
   {$ELSE}
   Result := 'libpython' + SysVersion + '.so';
   {$ENDIF}
@@ -400,7 +404,8 @@ function GetRegisteredPythonVersion(SysVersion: string;
   PythonVersion.IsRegistered := Result;
 end;
 
-function GetRegisteredPythonVersions : TPythonVersions;
+function GetRegisteredPythonVersions(const MinVersion: string = '0.0';
+  const MaxVersion: string = '100.100'): TPythonVersions;
 Var
   Count: Integer;
   I: Integer;
@@ -409,27 +414,40 @@ function GetRegisteredPythonVersions : TPythonVersions;
   Count := 0;
   SetLength(Result, High(PYTHON_KNOWN_VERSIONS));
   for I := High(PYTHON_KNOWN_VERSIONS) downto 1 do
+  begin
+    if CompareVersions(PYTHON_KNOWN_VERSIONS[I].RegVersion, MaxVersion) < 0 then
+      continue;
+    if CompareVersions(PYTHON_KNOWN_VERSIONS[I].RegVersion, MinVersion) > 0 then
+      break;
     if GetRegisteredPythonVersion(PYTHON_KNOWN_VERSIONS[I].RegVersion, PythonVersion) then
     begin
       Result[Count] := PythonVersion;
       Inc(Count);
     end;
+  end;
   SetLength(Result, Count);
 end;
 
-function GetLatestRegisteredPythonVersion(out PythonVersion: TPythonVersion): Boolean;
+function GetLatestRegisteredPythonVersion(out PythonVersion: TPythonVersion;
+  const MinVersion: string = '0.0'; const MaxVersion: string = '100.100'): Boolean;
 Var
   I: Integer;
 begin
+  Result := False;
   for I := High(PYTHON_KNOWN_VERSIONS) downto 1 do
   begin
-    Result := GetRegisteredPythonVersion(PYTHON_KNOWN_VERSIONS[I].RegVersion, PythonVersion);
-    if Result then break;
+    if CompareVersions(PYTHON_KNOWN_VERSIONS[I].RegVersion, MaxVersion) < 0 then
+      continue;
+    if CompareVersions(PYTHON_KNOWN_VERSIONS[I].RegVersion, MinVersion) > 0 then
+      break;
+    if GetRegisteredPythonVersion(PYTHON_KNOWN_VERSIONS[I].RegVersion, PythonVersion) then
+      Exit(True);
   end;
 end;
 
 function PythonVersionFromPath(const Path: string; out PythonVersion: TPythonVersion;
-  AcceptVirtualEnvs: Boolean = True): Boolean;
+  AcceptVirtualEnvs: Boolean = True; const MinVersion: string = '0.0';
+  const MaxVersion: string = '100.100'): Boolean;
 
   function FindPythonDLL(APath : string): string;
   Var
@@ -438,15 +456,15 @@ function PythonVersionFromPath(const Path: string; out PythonVersion: TPythonVer
     DLLFileName: string;
   begin
     Result := '';
-    Handle := FindFirstFile(PWideChar(APath+'\python??.dll'), FindFileData);
+    Handle := FindFirstFile(PWideChar(APath+'\python*.dll'), FindFileData);
     if Handle = INVALID_HANDLE_VALUE then Exit;  // not python dll
     DLLFileName:= FindFileData.cFileName;
     // skip if python3.dll was found
-    if Length(DLLFileName) <> 12 then FindNextFile(Handle, FindFileData);
+    if Length(DLLFileName) <= 11 then FindNextFile(Handle, FindFileData);
     if Handle = INVALID_HANDLE_VALUE then Exit;
     Windows.FindClose(Handle);
     DLLFileName:= FindFileData.cFileName;
-    if Length(DLLFileName) = 12 then
+    if Length(DLLFileName) > 11 then
       Result := DLLFileName;
   end;
 
@@ -506,16 +524,20 @@ function PythonVersionFromPath(const Path: string; out PythonVersion: TPythonVer
   end;
   PythonVersion.DLLPath := DLLPath;
 
-  SysVersion := GetPythonVersionFromDLLName(DLLFileName);
+  SysVersion := SysVersionFromDLLName(DLLFileName);
 
   PythonVersion.SysVersion := SysVersion;
   PythonVersion.fSysArchitecture := PythonVersion.ExpectedArchitecture;
 
-  for I := High(PYTHON_KNOWN_VERSIONS) downto 1 do
-    if PYTHON_KNOWN_VERSIONS[I].RegVersion = SysVersion then begin
-      Result := True;
-      break;
-    end;
+  if (CompareVersions(MinVersion, SysVersion) >= 0) and
+    (CompareVersions(MaxVersion, SysVersion) <= 0)
+  then
+    // Full search in case some python version is not supported
+    for I := High(PYTHON_KNOWN_VERSIONS) downto 1 do
+      if PYTHON_KNOWN_VERSIONS[I].RegVersion = SysVersion then begin
+        Result := True;
+        break;
+      end;
 end;
 
 {$ENDIF}

python4lazarus/VarPyth.pas

@@ -107,7 +107,7 @@ function MainModule: Variant; // return the main module that's used for executin
 function BuiltinModule: Variant; // return the builtin module
 function SysModule: Variant; // return the builtin module 'sys'
 function DatetimeModule: Variant; // return the builtin module 'datetime'
-function Import( const AModule : AnsiString ): Variant; // import a Python module and return the module object.
+function Import(const AModule: string): Variant; // import a Python module and return the module object.
 function len(const AValue : Variant ): NativeInt; // return the length of a Python collection.
 function _type(const AValue : Variant ): Variant; // return the type object of a Python object.
 function iter(const AValue : Variant ): Variant; // return an iterator for the container AValue. You can call the 'next' method of the iterator until you catch the EPyStopIteration exception.
@@ -691,7 +691,7 @@ function MainModule : Variant;
 
 function BuiltinModule : Variant;
 begin
-  Result := Import(AnsiString(GetPythonEngine.BuiltInModuleName));
+  Result := Import(GetPythonEngine.BuiltInModuleName);
 end;
 
 function SysModule : Variant;
@@ -704,7 +704,7 @@ function DatetimeModule : Variant; // return the builtin module 'datetime'
   Result := Import('datetime');
 end;
 
-function Import( const AModule : AnsiString ) : Variant;
+function Import(const AModule: string): Variant;
 var
   _module : PPyObject;
   _module_name : PPyObject;