@@ -2729,7 +2729,7 @@ procedure Register;
2729
2729
function PyType_HasFeature (AType : PPyTypeObject; AFlag : Integer) : Boolean;
2730
2730
function SysVersionFromDLLName (const DLLFileName : string): string;
2731
2731
procedure PythonVersionFromDLLName (LibName: string; out MajorVersion, MinorVersion: integer);
2732
- function VersionFromRegVersion (const ARegVersion: string;
2732
+ function PythonVersionFromRegVersion (const ARegVersion: string;
2733
2733
out AMajorVersion, AMinorVersion: integer): boolean;
2734
2734
2735
2735
{ Helper functions}
@@ -3246,7 +3246,7 @@ procedure TPythonInterface.AfterLoad;
3246
3246
inherited ;
3247
3247
if not FInExtensionModule then
3248
3248
PythonVersionFromDLLName(DLLName, FMajorVersion, FMinorVersion)
3249
- else if not VersionFromRegVersion (RegVersion, FMajorVersion, FMinorVersion) then
3249
+ else if not PythonVersionFromRegVersion (RegVersion, FMajorVersion, FMinorVersion) then
3250
3250
raise EDLLLoadError.Create(' Undetermined Python version.' );
3251
3251
3252
3252
FBuiltInModuleName := ' builtins' ;
@@ -4421,7 +4421,7 @@ procedure TPythonEngine.CheckRegistry;
4421
4421
try
4422
4422
VersionSuffix := ' ' ;
4423
4423
{ $IFDEF CPUX86}
4424
- VersionFromRegVersion (RegVersion, LMajorVersion, LMinorVersion);
4424
+ PythonVersionFromRegVersion (RegVersion, LMajorVersion, LMinorVersion);
4425
4425
if (LMajorVersion > 3 ) or ((LMajorVersion = 3 ) and (LMinorVersion >= 5 )) then
4426
4426
VersionSuffix := ' -32' ;
4427
4427
{ $ENDIF}
@@ -9159,7 +9159,7 @@ function IsPythonVersionRegistered(PythonVersion : string;
9159
9159
InstallPath := ' ' ;
9160
9160
AllUserInstall := False;
9161
9161
VersionSuffix := ' ' ;
9162
- VersionFromRegVersion (PythonVersion, LMajorVersion, LMinorVersion);
9162
+ PythonVersionFromRegVersion (PythonVersion, LMajorVersion, LMinorVersion);
9163
9163
{ $IFDEF CPUX86}
9164
9164
if (LMajorVersion > 3 ) or ((LMajorVersion = 3 ) and (LMinorVersion >= 5 )) then
9165
9165
VersionSuffix := ' -32' ;
@@ -9251,7 +9251,7 @@ procedure PythonVersionFromDLLName(LibName: string; out MajorVersion, MinorVersi
9251
9251
MinorVersion:= StrToIntDef(LibName, DefaultMinor);
9252
9252
end ;
9253
9253
9254
- function VersionFromRegVersion (const ARegVersion: string;
9254
+ function PythonVersionFromRegVersion (const ARegVersion: string;
9255
9255
out AMajorVersion, AMinorVersion: integer): boolean;
9256
9256
var
9257
9257
LSepPos: integer;
0 commit comments