Expose EncodeString (const str: AnsiString) to Delphi and correct its implementation.

pyscripter · pyscripter · commit c32596f9b8bc · 2024-09-23T17:46:42.000+03:00
diff --git a/Source/PythonEngine.pas b/Source/PythonEngine.pas
@@ -2041,10 +2041,8 @@   TPythonEngine = class(TPythonInterface)
     function   Run_CommandAsString(const command: AnsiString; mode: Integer; const FileName: string = '<string>'): string;
     function   Run_CommandAsObject(const command: AnsiString; mode: Integer; const FileName: string = '<string>'): PPyObject;
     function   Run_CommandAsObjectWithDict(const command: AnsiString; mode: Integer; locals, globals: PPyObject; const FileName: string = '<string>'): PPyObject;
-    function   EncodeString (const str: UnicodeString): AnsiString; {$IFDEF FPC}overload;{$ENDIF}
-    {$IFDEF FPC}
-    function   EncodeString (const str: AnsiString): AnsiString; overload;
-    {$ENDIF}
+    function   EncodeString(const str: UnicodeString): AnsiString; overload;
+    function   EncodeString(const str: AnsiString): AnsiString; overload;
     function   EncodeWindowsFilePath(const str: string): AnsiString;
     procedure  ExecString(const command: AnsiString; const FileName: string = '<string>'); overload;
     procedure  ExecStrings(strings: TStrings; const FileName: string = '<string>'); overload;
@@ -5538,17 +5536,15 @@ function   TPythonEngine.FindClient( const aName : string ) : TEngineClient;
         end;
 end;
 
-function TPythonEngine.EncodeString(const str: UnicodeString): AnsiString; {$IFDEF FPC}overload;{$ENDIF}
+function TPythonEngine.EncodeString(const str: UnicodeString): AnsiString;
 begin
-  Result := UTF8Encode(str)
+  Result := UTF8Encode(str);
 end;
 
-{$IFDEF FPC}
-function TPythonEngine.EncodeString (const str: AnsiString): AnsiString; overload;
+function TPythonEngine.EncodeString(const str: AnsiString): AnsiString;
 begin
-  Result := str;
+  Result := UTF8Encode(str);
 end;
-{$ENDIF}
 
 function TPythonEngine.EncodeWindowsFilePath(const str: string): AnsiString;
 {PEP 529}
