Removed support for Python 2.5 and 2.6.

Author: pyscripter

PythonForDelphi/Components/Sources/Core/PythonEngine.pas

@@ -102,10 +102,8 @@ TPythonVersionProp = record
  end;
 const
 {$IFDEF MSWINDOWS}
- PYTHON_KNOWN_VERSIONS: array[1..10] of TPythonVersionProp =
+ PYTHON_KNOWN_VERSIONS: array[1..8] of TPythonVersionProp =
  (
- (DllName: 'python25.dll'; RegVersion: '2.5'; APIVersion: 1013),
- (DllName: 'python26.dll'; RegVersion: '2.6'; APIVersion: 1013),
  (DllName: 'python27.dll'; RegVersion: '2.7'; APIVersion: 1013),
  (DllName: 'python32.dll'; RegVersion: '3.2'; APIVersion: 1013),
  (DllName: 'python33.dll'; RegVersion: '3.3'; APIVersion: 1013),
@@ -117,10 +115,8 @@ TPythonVersionProp = record
  );
 {$ENDIF}
 {$IFDEF _so_files}
- PYTHON_KNOWN_VERSIONS: array[1..10] of TPythonVersionProp =
+ PYTHON_KNOWN_VERSIONS: array[1..8] of TPythonVersionProp =
  (
- (DllName: 'libpython2.5.so'; RegVersion: '2.5'; APIVersion: 1013),
- (DllName: 'libpython2.6.so'; RegVersion: '2.6'; APIVersion: 1013),
  (DllName: 'libpython2.7.so'; RegVersion: '2.7'; APIVersion: 1013),
  (DllName: 'libpython3.2.so'; RegVersion: '3.2'; APIVersion: 1013),
  (DllName: 'libpython3.3.so'; RegVersion: '3.3'; APIVersion: 1013),
@@ -132,10 +128,8 @@ TPythonVersionProp = record
  );
 {$ENDIF}
 {$IFDEF DARWIN}
- PYTHON_KNOWN_VERSIONS: array[1..10] of TPythonVersionProp =
+ PYTHON_KNOWN_VERSIONS: array[1..8] of TPythonVersionProp =
  (
- (DllName: 'libpython2.5.dylib'; RegVersion: '2.5'; APIVersion: 1013),
- (DllName: 'libpython2.6.dylib'; RegVersion: '2.6'; APIVersion: 1013),
  (DllName: 'libpython2.7.dylib'; RegVersion: '2.7'; APIVersion: 1013),
  (DllName: 'libpython3.2.dylib'; RegVersion: '3.2'; APIVersion: 1013),
  (DllName: 'libpython3.3.dylib'; RegVersion: '3.3'; APIVersion: 1013),
@@ -4719,7 +4713,7 @@ procedure TPythonEngine.DoOpenDll(const aDllName : string);
  i : Integer;
 begin
  if UseLastKnownVersion then
- for i:= Integer(COMPILED_FOR_PYTHON_VERSION_INDEX) downto 0 do
+ for i:= Integer(COMPILED_FOR_PYTHON_VERSION_INDEX) downto 1 do
  begin
  RegVersion := PYTHON_KNOWN_VERSIONS[i].RegVersion;
  FDLLHandle := SafeLoadLibrary(GetDllPath+PYTHON_KNOWN_VERSIONS[i].DllName);

PythonForDelphi/Components/Sources/Core/PythonVersions.pas

@@ -406,8 +406,8 @@ function GetRegisteredPythonVersions : TPythonVersions;
  PythonVersion : TPythonVersion;
 begin
  Count := 0;
- SetLength(Result, High(PYTHON_KNOWN_VERSIONS) - COMPILED_FOR_PYTHON_VERSION_INDEX + 1);
- for I := High(PYTHON_KNOWN_VERSIONS) downto COMPILED_FOR_PYTHON_VERSION_INDEX do
+ SetLength(Result, High(PYTHON_KNOWN_VERSIONS));
+ for I := High(PYTHON_KNOWN_VERSIONS) downto 1 do
  if GetRegisteredPythonVersion(PYTHON_KNOWN_VERSIONS[I].RegVersion, PythonVersion) then
  begin
  Result[Count] := PythonVersion;
@@ -420,7 +420,7 @@ function GetLatestRegisteredPythonVersion(out PythonVersion: TPythonVersion): Bo
 Var
  I: Integer;
 begin
- for I := High(PYTHON_KNOWN_VERSIONS) downto COMPILED_FOR_PYTHON_VERSION_INDEX do
+ for I := High(PYTHON_KNOWN_VERSIONS) downto 1 do
  begin
  Result := GetRegisteredPythonVersion(PYTHON_KNOWN_VERSIONS[I].RegVersion, PythonVersion);
  if Result then break;
@@ -514,7 +514,7 @@ function PythonVersionFromPath(const Path: string; out PythonVersion: TPythonVer
  PythonVersion.SysVersion := SysVersion;
  PythonVersion.fSysArchitecture := PythonVersion.ExpectedArchitecture;
 
- for I := High(PYTHON_KNOWN_VERSIONS) downto COMPILED_FOR_PYTHON_VERSION_INDEX do
+ for I := High(PYTHON_KNOWN_VERSIONS) downto 1 do
  if PYTHON_KNOWN_VERSIONS[I].RegVersion = SysVersion then begin
  Result := True;
  break;