Skip to content

Commit c32596f

Browse files
committed
Expose EncodeString (const str: AnsiString) to Delphi and correct its implementation.
1 parent a650ee7 commit c32596f

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

Source/PythonEngine.pas

+6-10
Original file line numberDiff line numberDiff line change
@@ -2041,10 +2041,8 @@ TPythonEngine = class(TPythonInterface)
20412041
function Run_CommandAsString(const command: AnsiString; mode: Integer; const FileName: string = '<string>'): string;
20422042
function Run_CommandAsObject(const command: AnsiString; mode: Integer; const FileName: string = '<string>'): PPyObject;
20432043
function Run_CommandAsObjectWithDict(const command: AnsiString; mode: Integer; locals, globals: PPyObject; const FileName: string = '<string>'): PPyObject;
2044-
function EncodeString (const str: UnicodeString): AnsiString; {$IFDEF FPC}overload;{$ENDIF}
2045-
{$IFDEF FPC}
2046-
function EncodeString (const str: AnsiString): AnsiString; overload;
2047-
{$ENDIF}
2044+
function EncodeString(const str: UnicodeString): AnsiString; overload;
2045+
function EncodeString(const str: AnsiString): AnsiString; overload;
20482046
function EncodeWindowsFilePath(const str: string): AnsiString;
20492047
procedure ExecString(const command: AnsiString; const FileName: string = '<string>'); overload;
20502048
procedure ExecStrings(strings: TStrings; const FileName: string = '<string>'); overload;
@@ -5538,17 +5536,15 @@ function TPythonEngine.FindClient( const aName : string ) : TEngineClient;
55385536
end;
55395537
end;
55405538

5541-
function TPythonEngine.EncodeString(const str: UnicodeString): AnsiString; {$IFDEF FPC}overload;{$ENDIF}
5539+
function TPythonEngine.EncodeString(const str: UnicodeString): AnsiString;
55425540
begin
5543-
Result := UTF8Encode(str)
5541+
Result := UTF8Encode(str);
55445542
end;
55455543

5546-
{$IFDEF FPC}
5547-
function TPythonEngine.EncodeString (const str: AnsiString): AnsiString; overload;
5544+
function TPythonEngine.EncodeString(const str: AnsiString): AnsiString;
55485545
begin
5549-
Result := str;
5546+
Result := UTF8Encode(str);
55505547
end;
5551-
{$ENDIF}
55525548

55535549
function TPythonEngine.EncodeWindowsFilePath(const str: string): AnsiString;
55545550
{PEP 529}

0 commit comments

Comments
 (0)