Skip to content

Including support for host symbols #350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 20, 2022
Merged

Including support for host symbols #350

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 80 additions & 3 deletions Source/PythonEngine.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1181,6 +1181,8 @@ TDynamicDll = class(TComponent)
procedure DoOpenDll(const aDllName : string); virtual;
function GetDllPath : string;

function HasHostSymbols(): boolean;
procedure LoadFromHostSymbols();
public
// Constructors & Destructors
constructor Create(AOwner: TComponent); override;
Expand Down Expand Up @@ -2727,6 +2729,8 @@ procedure Register;
function PyType_HasFeature(AType : PPyTypeObject; AFlag : Integer) : Boolean;
function SysVersionFromDLLName(const DLLFileName : string): string;
procedure PythonVersionFromDLLName(LibName: string; out MajorVersion, MinorVersion: integer);
function SpliVersionFromRegVersion(const ARegVersion: string;
out AMajorVersion, AMinorVersion: integer): boolean;

{ Helper functions}
(*
Expand Down Expand Up @@ -3083,15 +3087,62 @@ function TDynamicDll.IsHandleValid : Boolean;
{$ENDIF}
end;

procedure TDynamicDll.LoadFromHostSymbols;
var
LPy_GetVersion: function: PAnsiChar; cdecl;
LPy_GetProgramFullPath: function: PAnsiChar; cdecl;
LVersion: string;
LInfo: TPythonVersionProp;
LFound: boolean;
begin
BeforeLoad();
//According to the doc:
//Return the full program name of the Python executable.
//The value is available to Python code as sys.executable.
LPy_GetProgramFullPath := Import('Py_GetProgramFullPath');
DllName := ExtractFileName(String(LPy_GetProgramFullPath()));

//According to the doc:
//The first word (up to the first space character) is the current Python version
LPy_GetVersion := Import('Py_GetVersion');
LVersion := String(LPy_GetVersion());
LVersion := Copy(LVersion, 1, Pos(' ', LVersion));
//the first three characters are the major and minor version separated by a period.
if (Length(LVersion) > 3) and (LVersion[4] <> '.') then
LVersion := Copy(LVersion, 1, 4) //e.g. 3.10
else
LVersion := Copy(LVersion, 1, 3); //e.g. 3.9

LFound := false;
for LInfo in PYTHON_KNOWN_VERSIONS do
if (LInfo.RegVersion = LVersion) then begin
RegVersion := LInfo.RegVersion;
APIVersion := LInfo.APIVersion;
LFound := true;
Break;
end;

if not LFound then
raise EDLLLoadError.Create('Undetermined Python version from host symbols.');

AfterLoad();
end;

procedure TDynamicDll.LoadDll;
begin
OpenDll( DllName );
end;

procedure TDynamicDll.LoadDllInExtensionModule;
begin
//We want to look in for host symbols at first
FDLLHandle := 0;

FInExtensionModule := True;
LoadDLL;
if HasHostSymbols() then
LoadFromHostSymbols()
else
LoadDLL;
end;

procedure TDynamicDll.UnloadDll;
Expand Down Expand Up @@ -3126,6 +3177,17 @@ function TDynamicDll.GetQuitMessage : string;
Result := Format( 'Dll %s could not be loaded. We must quit.', [DllName]);
end;

function TDynamicDll.HasHostSymbols: boolean;
var
LPy_IsInitialized: function: integer; cdecl;
begin
if not ModuleIsLib then
Exit(false);

LPy_IsInitialized := Import('Py_IsInitialized', false);
Result := Assigned(LPy_IsInitialized) and (LPy_IsInitialized() <> 0);
end;

procedure TDynamicDll.Quit;
begin
if not( csDesigning in ComponentState ) then begin
Expand Down Expand Up @@ -3182,7 +3244,10 @@ constructor TPythonInterface.Create(AOwner: TComponent);
procedure TPythonInterface.AfterLoad;
begin
inherited;
PythonVersionFromDLLName(DLLName, FMajorVersion, FMinorVersion);
if not FInExtensionModule then
PythonVersionFromDLLName(DLLName, FMajorVersion, FMinorVersion)
else if not SpliVersionFromRegVersion(RegVersion, FMajorVersion, FMinorVersion) then
raise EDLLLoadError.Create('Undetermined Python version.');

FBuiltInModuleName := 'builtins';

Expand Down Expand Up @@ -3578,7 +3643,7 @@ procedure TPythonInterface.MapDll;
Py_GetPrefix := Import('Py_GetPrefix');
Py_GetProgramName := Import('Py_GetProgramName');

if (FMajorVersion = 3) and (MinorVersion < 10) then
if (FMajorVersion = 3) and (FMinorVersion < 10) then
begin
PyParser_SimpleParseStringFlags := Import('PyParser_SimpleParseStringFlags');
PyNode_Free := Import('PyNode_Free');
Expand Down Expand Up @@ -9188,6 +9253,18 @@ procedure PythonVersionFromDLLName(LibName: string; out MajorVersion, MinorVersi
MinorVersion:= StrToIntDef(LibName, DefaultMinor);
end;

function SpliVersionFromRegVersion(const ARegVersion: string;
out AMajorVersion, AMinorVersion: integer): boolean;
var
LSepPos: integer;
begin
//RegVersion supported format: [x.x or x.xx or x[..].x[..]]
LSepPos := Pos('.', ARegVersion);
AMajorVersion := StrToIntDef(Copy(ARegVersion, 1, LSepPos - 1), 0);
AMinorVersion := StrToIntDef(Copy(ARegVersion, LSepPos + 1, Length(ARegVersion) - LSepPos), 0);

Result := (AMajorVersion > 0) and (AMinorVersion > 0);
end;

end.