Improve the handling of python bytes and AnsiStrings

Author: pyscripter

Source/PythonEngine.pas

@@ -5414,25 +5414,22 @@ procedure TPythonEngine.RaiseError;
 function TPythonEngine.PyObjectAsString( obj : PPyObject ) : string;
 var
  S : PPyObject;
- W : UnicodeString;
 begin
  Result := '';
  if not Assigned( obj ) then
  Exit;
 
  if PyUnicode_Check(obj) then
+ Result := string(PyUnicodeAsString(obj))
+ else if PyBytes_Check(obj) then
+ Result := string(UTF8ToString(PyBytesAsAnsiString(obj)))
+ else
  begin
- W := PyUnicodeAsString(obj);
- Result := string(W);
- Exit;
- end;
- S := PyObject_Str( obj );
- if Assigned(S) and PyUnicode_Check(S) then
- begin
- W := PyUnicodeAsString(S);
- Result := string(W);
+ S := PyObject_Str( obj );
+ if Assigned(S) and PyUnicode_Check(S) then
+ Result := string(PyUnicodeAsString(S));
+ Py_XDECREF(S);
  end;
- Py_XDECREF(S);
 end;
 
 procedure TPythonEngine.DoRedirectIO;

Source/WrapDelphi.pas

@@ -2033,8 +2033,16 @@ function SimplePythonToValue(PyValue: PPyObject; TypeInfo: PTypeInfo;
  end
  else
  ErrMsg := rs_ErrPythonToValue;
- tkString, tkWString, tkUString,
- tkLString, tkChar, tkWChar:
+ tkString, tkLString, tkChar:
+ begin
+ if GetPythonEngine.PyBytes_Check(PyValue) then
+ V := TValue.From(GetPythonEngine.PyBytesAsAnsiString(PyValue))
+ else
+ V := GetPythonEngine.PyObjectAsString(PyValue);
+ Value := V.Cast(TypeInfo);
+ Result := True;
+ end;
+ tkWString, tkUString, tkWChar:
  begin
  V := GetPythonEngine.PyObjectAsString(PyValue);
  Value := V.Cast(TypeInfo);