Issue 19

Author: pyscripter

PythonForDelphi/Components/Sources/Core/PythonEngine.pas

@@ -2241,7 +2241,7 @@   TPythonEngine = class(TPythonInterface)
     function   PyTZInfo_Check( obj : PPyObject ) : Boolean;
     function   PyTZInfo_CheckExact( obj : PPyObject ) : Boolean;
     { end date/time functions }
-    function   PyString_FromString( str: PAnsiChar): PPyObject; override;
+    function PyString_FromString( str: PAnsiChar): PPyObject; override;
     function PyString_AsDelphiString( ob: PPyObject): string; override;
     function PyString_AsAnsiString( ob: PPyObject): AnsiString;
     function PyString_AsWideString( ob: PPyObject): UnicodeString;
@@ -5753,13 +5753,13 @@ function TPythonEngine.VariantAsPyObject( const V : Variant ) : PPyObject;
         Result := PyUnicode_FromWideChar( PWideChar(wStr), Length(wStr) );
       {$ELSE}
         s := wStr;
-        Result := PyString_FromString( PAnsiChar(s) );
+        Result := PyString_FromStringAndSize(PAnsiChar(s), Length(s));
       {$ENDIF}
       end;
     varString:
       begin
         s := AnsiString(DeRefV);
-        Result := PyString_FromString( PAnsiChar(s) );
+        Result := PyString_FromStringAndSize(PAnsiChar(s), Length(s));
       end;
    {$IFDEF UNICODE}
     varUString:
@@ -5769,7 +5769,7 @@ function TPythonEngine.VariantAsPyObject( const V : Variant ) : PPyObject;
         Result := PyUnicode_FromWideChar( PWideChar(wStr), Length(wStr) );
       {$ELSE}
         s := wStr;
-        Result := PyString_FromString( PAnsiChar(s) );
+        Result := PyString_FromStringAndSize(PAnsiChar(s), Length(s));
       {$ENDIF}
       end;
     {$ENDIF}

PythonForDelphi/Components/Sources/Core/VarPyth.pas

@@ -200,6 +200,7 @@   TPythonData = class(TObject)
     procedure SetPyObject(const Value: PPyObject);
     function GetAsVariant: Variant;
     function GetAsWideString: UnicodeString;
+    function GetAsAnsiString: AnsiString;
   public
     constructor Create(AObject : PPyObject); overload;
     constructor Create(AObject : PPyObject; APythonAtomCompatible : Boolean); overload;
@@ -233,6 +234,7 @@   TPythonData = class(TObject)
 
     // conversion
     property AsString: String read GetAsString;
+    property AsAnsiString: AnsiString read GetAsAnsiString;
     property AsVariant: Variant read GetAsVariant;
     property AsWideString: UnicodeString read GetAsWideString;
 
@@ -828,7 +830,12 @@ procedure TPythonVariantType.CastTo(var Dest: TVarData;
       varOleStr {$IFDEF UNICODE}, varUString {$ENDIF} :
         VarDataFromOleStr(Dest, TPythonVarData(Source).VPython.AsWideString);
       varString:
+        {$IFDEF UNICODE}
+        // Preserve AnsiStrings
+        VarDataFromLStr(Dest, TPythonVarData(Source).VPython.AsAnsiString);
+        {$ELSE}
         VarDataFromStr(Dest, TPythonVarData(Source).VPython.AsString);
+        {$ENDIF}
     else
       if AVarType and varTypeMask = varBoolean then
       begin
@@ -2177,6 +2184,14 @@ function TPythonData.Equal(const Right: TPythonData): Boolean;
   end; // of with
 end;
 
+function TPythonData.GetAsAnsiString: AnsiString;
+begin
+  if Assigned(PyObject) and GetPythonEngine.PyString_CheckExact(PyObject) then
+    Result := GetPythonEngine.PyString_AsString(PyObject)
+  else
+    result := GetAsString;
+end;
+
 function TPythonData.GetAsString: String;
 begin
   if Assigned(PyObject) then