test directory for python scripts

lazpaint/uprocessauto.pas

@@ -20,6 +20,9 @@ type
   TSendLineMethod = procedure(const ALine: RawByteString) of object;
   TBusyEvent = procedure(var ASleep: boolean) of object;
 
+var
+  AutomationEnvironment: TStringList;
+
 procedure RunProcessAutomation(AExecutable: string; AParameters: array of string;
   out ASendLine: TSendLineMethod;
   AOnReceiveOutput: TReceiveLineEvent;
@@ -118,6 +121,8 @@ begin
   p := TAutomatedProcess.Create(nil);
   ASendLine := @p.SendLine;
   try
+    for i := 0 to AutomationEnvironment.Count-1 do
+      p.Environment.Add(AutomationEnvironment[i]);
     p.Executable:= AExecutable;
     for i := 0 to high(AParameters) do
       p.Parameters.Add(AParameters[i]);
@@ -157,5 +162,13 @@ begin
   Input.Write(LineEndingStr[1],length(LineEndingStr));
 end;
 
+initialization
+
+  AutomationEnvironment := TStringList.Create;
+
+finalization
+
+  AutomationEnvironment.Free;
+
 end.
 

lazpaint/upython.pas

@@ -48,7 +48,7 @@ function GetPythonVersion(APythonBin: string = DefaultPythonBin): string;
 
 implementation
 
-uses process, UResourceStrings;
+uses process, UResourceStrings, Forms;
 
 function GetPythonVersion(APythonBin: string = DefaultPythonBin): string;
 const PythonVersionPrefix = 'Python ';
@@ -191,7 +191,17 @@ begin
         '%1',inttostr(APythonVersion),[]),
         '%2',inttostr(PythonVersionMajor),[]) );
   FFirstOutput:= true;
-  RunProcessAutomation(FPythonBin, ['-u', AScriptFilename], FPythonSend, @PythonOutput, @PythonError, @PythonBusy);
+  AutomationEnvironment.Add('PYTHONPATH='+
+    {$IFDEF DEBUG}
+    ExtractFilePath(Application.ExeName)+PathDelim+'..'+PathDelim+'..'+PathDelim+'..'+PathDelim+'scripts'
+    {$ELSE}
+    ExtractFilePath(Application.ExeName)+PathDelim+'scripts'
+    {$ENDIF});
+  try
+    RunProcessAutomation(FPythonBin, ['-u', AScriptFilename], FPythonSend, @PythonOutput, @PythonError, @PythonBusy);
+  finally
+    AutomationEnvironment.Clear;
+  end;
   FPythonSend := nil;
 end;