PyByteArray added.

Author: pyscripter

Source/PythonEngine.pas

@@ -230,6 +230,7 @@   TPythonVersionProp = record
   WCharTString = UnicodeString;
 {$ENDIF}
 
+  Py_ssize_t = NativeInt;
 
   const
 {
@@ -940,6 +941,27 @@   TPythonVersionProp = record
   end;
   PPyDateTime_DateTime = ^PyDateTime_DateTime;
 
+  //bytearrayobject.h
+
+  //typedef struct {
+  //  PyObject_VAR_HEAD
+  //  Py_ssize_t ob_alloc;   /* How many bytes allocated in ob_bytes */
+  //  char *ob_bytes;        /* Physical backing buffer */
+  //  char *ob_start;        /* Logical start inside ob_bytes */
+  //  Py_ssize_t ob_exports; /* How many buffer exports */
+  //} PyByteArrayObject;
+
+  PyByteArrayObject = {$IFDEF CPUX86}packed{$ENDIF} record
+    // Start of PyObject_VAR_HEAD
+    // Start of the Head of an object
+    ob_base: PyObject;
+    ob_size: Py_ssize_t;
+    // End of the Head of an object
+    ob_bytes: PAnsiChar;
+    ob_start: PAnsiChar;
+    ob_exports: Py_ssize_t;
+  end;
+
 //#######################################################
 //##                                                   ##
 //##         GIL state                                 ##
@@ -1361,6 +1383,7 @@   TPythonInterface=class(TDynamicDll)
     PyRange_Type: PPyTypeObject;
     PySlice_Type: PPyTypeObject;
     PyBytes_Type: PPyTypeObject;
+    PyByteArray_Type: PPyTypeObject;
     PyTuple_Type: PPyTypeObject;
     PyBaseObject_Type: PPyTypeObject;
     PyCallIter_Type: PPyTypeObject;
@@ -1440,6 +1463,7 @@   TPythonInterface=class(TDynamicDll)
     PyRun_SimpleString:   function( str: PAnsiChar): Integer; cdecl;
     PyBytes_AsString:    function( ob: PPyObject): PAnsiChar; cdecl;
     PyBytes_AsStringAndSize: function( ob: PPyObject; var buffer: PAnsiChar; var size: NativeInt): integer; cdecl;
+    PyByteArray_AsString: function(ob: PPyObject): PAnsiChar; cdecl;
     PySys_SetArgv:        procedure( argc: Integer; argv: PPWCharT); cdecl;
 
     PyCFunction_NewEx: function(md:PPyMethodDef;self, ob:PPyObject):PPyObject; cdecl;
@@ -1588,6 +1612,11 @@   TPythonInterface=class(TDynamicDll)
     PyBytes_Size:function (ob:PPyObject):NativeInt; cdecl;
     PyBytes_DecodeEscape:function(s:PAnsiChar; len:NativeInt; errors:PAnsiChar; unicode:NativeInt; recode_encoding:PAnsiChar):PPyObject; cdecl;
     PyBytes_Repr:function(ob:PPyObject; smartquotes:integer):PPyObject; cdecl;
+    PyByteArray_Concat: procedure(var ob1: PPyObject; ob2: PPyObject); cdecl;
+    PyByteArray_Resize: procedure(var ob1: PPyObject; len: Py_ssize_t); cdecl;
+    PyByteArray_FromObject: function(ob:PPyObject): PPyObject; cdecl;
+    PyByteArray_FromStringAndSize: function(s: PAnsiChar; i: Py_ssize_t): PPyObject; cdecl;
+    PyByteArray_Size: function(ob: PPyObject): Py_ssize_t; cdecl;
     PySys_GetObject:function (s:PAnsiChar):PPyObject; cdecl;
     PySys_SetObject:function (s:PAnsiChar;ob:PPyObject):integer; cdecl;
     PySys_SetPath:procedure(path:PAnsiChar); cdecl;
@@ -1715,6 +1744,8 @@   TPythonInterface=class(TDynamicDll)
 
   function PyBytes_Check( obj : PPyObject ) : Boolean;
   function PyBytes_CheckExact( obj : PPyObject ) : Boolean;
+  function PyByteArray_Check(obj: PPyObject): Boolean;
+  function PyByteArray_CheckExact(obj: PPyObject): Boolean;
   function PyFloat_Check( obj : PPyObject ) : Boolean;
   function PyFloat_CheckExact( obj : PPyObject ) : Boolean;
   function PyLong_Check( obj : PPyObject ) : Boolean;
@@ -3557,6 +3588,7 @@ procedure TPythonInterface.MapDll;
   PyRange_Type               := Import('PyRange_Type');
   PySlice_Type               := Import('PySlice_Type');
   PyBytes_Type               := Import('PyBytes_Type');
+  PyByteArray_Type           := Import('PyByteArray_Type');
   PyTuple_Type               := Import('PyTuple_Type');
   PyUnicode_Type             := Import('PyUnicode_Type');
   PyBaseObject_Type          := Import('PyBaseObject_Type');
@@ -3776,6 +3808,12 @@ procedure TPythonInterface.MapDll;
   PyBytes_DecodeEscape        := Import('PyBytes_DecodeEscape');
   PyBytes_Repr                := Import('PyBytes_Repr');
   _PyBytes_Resize             := Import('_PyBytes_Resize');
+  PyByteArray_AsString        := Import('PyByteArray_AsString');
+  PyByteArray_Concat          := Import('PyByteArray_Concat');
+  PyByteArray_Resize          := Import('PyByteArray_Resize');
+  PyByteArray_FromObject      := Import('PyByteArray_FromObject');
+  PyByteArray_FromStringAndSize := Import('PyByteArray_FromStringAndSize');
+  PyByteArray_Size            := Import('PyByteArray_Size');
   PySys_GetObject             := Import('PySys_GetObject');
   PySys_SetObject             := Import('PySys_SetObject');
   PySys_SetPath               := Import('PySys_SetPath');
@@ -3909,6 +3947,16 @@ class procedure TPythonInterface.Py_CLEAR(var op: PPyObject);
   end;
 end;
 
+function TPythonInterface.PyByteArray_Check(obj: PPyObject): Boolean;
+begin
+  Result := PyObject_TypeCheck(obj, PyByteArray_Type);
+end;
+
+function TPythonInterface.PyByteArray_CheckExact(obj: PPyObject): Boolean;
+begin
+  Result := Assigned( obj ) and (obj^.ob_type = PPyTypeObject(PyByteArray_Type));
+end;
+
 function TPythonInterface.PyBytes_Check( obj : PPyObject ) : Boolean;
 begin
   Result := PyObject_TypeCheck(obj, PyBytes_Type);