@@ -2729,7 +2729,7 @@ procedure Register;
27292729function PyType_HasFeature (AType : PPyTypeObject; AFlag : Integer) : Boolean;
27302730function SysVersionFromDLLName (const DLLFileName : string): string;
27312731procedure PythonVersionFromDLLName (LibName: string; out MajorVersion, MinorVersion: integer);
2732- function VersionFromRegVersion (const ARegVersion: string;
2732+ function PythonVersionFromRegVersion (const ARegVersion: string;
27332733 out AMajorVersion, AMinorVersion: integer): boolean;
27342734
27352735{ Helper functions}
@@ -3246,7 +3246,7 @@ procedure TPythonInterface.AfterLoad;
32463246 inherited ;
32473247 if not FInExtensionModule then
32483248 PythonVersionFromDLLName(DLLName, FMajorVersion, FMinorVersion)
3249- else if not VersionFromRegVersion (RegVersion, FMajorVersion, FMinorVersion) then
3249+ else if not PythonVersionFromRegVersion (RegVersion, FMajorVersion, FMinorVersion) then
32503250 raise EDLLLoadError.Create(' Undetermined Python version.' );
32513251
32523252 FBuiltInModuleName := ' builtins' ;
@@ -4421,7 +4421,7 @@ procedure TPythonEngine.CheckRegistry;
44214421 try
44224422 VersionSuffix := ' ' ;
44234423{ $IFDEF CPUX86}
4424- VersionFromRegVersion (RegVersion, LMajorVersion, LMinorVersion);
4424+ PythonVersionFromRegVersion (RegVersion, LMajorVersion, LMinorVersion);
44254425 if (LMajorVersion > 3 ) or ((LMajorVersion = 3 ) and (LMinorVersion >= 5 )) then
44264426 VersionSuffix := ' -32' ;
44274427{ $ENDIF}
@@ -9159,7 +9159,7 @@ function IsPythonVersionRegistered(PythonVersion : string;
91599159 InstallPath := ' ' ;
91609160 AllUserInstall := False;
91619161 VersionSuffix := ' ' ;
9162- VersionFromRegVersion (PythonVersion, LMajorVersion, LMinorVersion);
9162+ PythonVersionFromRegVersion (PythonVersion, LMajorVersion, LMinorVersion);
91639163{ $IFDEF CPUX86}
91649164 if (LMajorVersion > 3 ) or ((LMajorVersion = 3 ) and (LMinorVersion >= 5 )) then
91659165 VersionSuffix := ' -32' ;
@@ -9251,7 +9251,7 @@ procedure PythonVersionFromDLLName(LibName: string; out MajorVersion, MinorVersi
92519251 MinorVersion:= StrToIntDef(LibName, DefaultMinor);
92529252end ;
92539253
9254- function VersionFromRegVersion (const ARegVersion: string;
9254+ function PythonVersionFromRegVersion (const ARegVersion: string;
92559255 out AMajorVersion, AMinorVersion: integer): boolean;
92569256var
92579257 LSepPos: integer;
0 commit comments