ToPythonRawString - Python 2.x expects ANSI and Python 3.x expects utf8; ToPythonRawString will make the right RawString.

Author: Idan Miara

PythonForDelphi/Components/Sources/Core/PythonEngine.pas

@@ -2253,6 +2253,7 @@   TPythonEngine = class(TPythonInterface)
     function   Run_CommandAsString(const command : AnsiString; mode : Integer) : String;
     function   Run_CommandAsObject(const command : AnsiString; mode : Integer) : PPyObject;
     function   Run_CommandAsObjectWithDict(const command : AnsiString; mode : Integer; locals, globals : PPyObject) : PPyObject;
+    function   ToPythonRawString (str: String): AnsiString;
     procedure  ExecString(const command : AnsiString); overload;
     procedure  ExecStrings( strings : TStrings ); overload;
     function   EvalString(const command : AnsiString) : PPyObject; overload;
@@ -5135,7 +5136,7 @@ procedure TPythonEngine.SetPyFlags(const Value: TPythonFlags);
 procedure TPythonEngine.SetPythonHome(PythonHome: String);
 begin
   FPythonHomeW := PythonHome;
-  FPythonHome := UTF8Encode(PythonHome);
+  FPythonHome := ToPythonRawString(PythonHome);
 end;
 
 function TPythonEngine.IsType(ob: PPyObject; obt: PPyTypeObject): Boolean;
@@ -5307,12 +5308,12 @@ function TPythonEngine.Run_CommandAsObjectWithDict(const command : AnsiString; m
 
 procedure TPythonEngine.ExecStrings( strings : TStrings );
 begin
-  Py_XDecRef( Run_CommandAsObject( CleanString( UTF8Encode(strings.Text) ), file_input ) );
+  Py_XDecRef( Run_CommandAsObject( CleanString( ToPythonRawString(strings.Text) ), file_input ) );
 end;
 
 function TPythonEngine.EvalStrings( strings : TStrings ) : PPyObject;
 begin
-  Result := Run_CommandAsObject( CleanString( UTF8Encode(strings.Text) ), eval_input );
+  Result := Run_CommandAsObject( CleanString( ToPythonRawString(strings.Text) ), eval_input );
 end;
 
 procedure TPythonEngine.ExecString(const command : AnsiString; locals, globals : PPyObject );
@@ -5322,7 +5323,7 @@ procedure TPythonEngine.ExecString(const command : AnsiString; locals, globals :
 
 procedure TPythonEngine.ExecStrings( strings : TStrings; locals, globals : PPyObject );
 begin
-  Py_XDecRef( Run_CommandAsObjectWithDict( CleanString( UTF8Encode(strings.Text) ), file_input, locals, globals ) );
+  Py_XDecRef( Run_CommandAsObjectWithDict( CleanString( ToPythonRawString(strings.Text) ), file_input, locals, globals ) );
 end;
 
 function TPythonEngine.EvalString( const command : AnsiString; locals, globals : PPyObject ) : PPyObject;
@@ -5332,12 +5333,12 @@ function TPythonEngine.EvalString( const command : AnsiString; locals, globals :
 
 function TPythonEngine.EvalStrings( strings : TStrings; locals, globals : PPyObject ) : PPyObject;
 begin
-  Result := Run_CommandAsObjectWithDict( CleanString( UTF8Encode(strings.Text) ), eval_input, locals, globals );
+  Result := Run_CommandAsObjectWithDict( CleanString( ToPythonRawString(strings.Text) ), eval_input, locals, globals );
 end;
 
 function TPythonEngine.EvalStringsAsStr( strings : TStrings ) : String;
 begin
-  Result := Run_CommandAsString( CleanString( UTF8Encode(strings.Text) ), eval_input );
+  Result := Run_CommandAsString( CleanString( ToPythonRawString(strings.Text) ), eval_input );
 end;
 
 function TPythonEngine.CheckEvalSyntax( const str : AnsiString ) : Boolean;
@@ -5685,6 +5686,14 @@ function   TPythonEngine.FindClient( const aName : string ) : TEngineClient;
         end;
 end;
 
+function TPythonEngine.ToPythonRawString(str: String): AnsiString;
+begin
+  if IsPython3000 then
+    Result := UTF8Encode(str)
+  else
+    Result := AnsiString(str);
+end;
+
 function   TPythonEngine.TypeByName( const aTypeName : AnsiString ) : PPyTypeObject;
 var
   i : Integer;