Skip to content

Commit d4ceea3

Browse files
pyscripterpyscripter
committed
Fix pyscripter#111 Added PyUnicode_FromString and PyUnicode_FromStringAndSize
1 parent 4ab65c9 commit d4ceea3

File tree

1 file changed

+32
-28
lines changed

1 file changed

+32
-28
lines changed

‎PythonForDelphi/Components/Sources/Core/PythonEngine.pas‎

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1882,6 +1882,8 @@ TPythonInterface=class(TDynamicDll)
18821882
PyType_GenericNew:function(atype: PPyTypeObject; args, kwds : PPyObject) : PPyObject; cdecl;
18831883
PyType_Ready:function(atype: PPyTypeObject) : integer; cdecl;
18841884
PyUnicode_FromWideChar:function (const w:PWideChar; size:NativeInt):PPyObject; cdecl;
1885+
PyUnicode_FromString:function (s:PAnsiChar):PPyObject; cdecl;
1886+
PyUnicode_FromStringAndSize:function (s:PAnsiChar;i:NativeInt):PPyObject; cdecl;
18851887
PyUnicode_AsWideChar:function (unicode: PPyObject; w:PWideChar; size:NativeInt):integer; cdecl;
18861888
PyUnicode_Decode:function (const s:PAnsiChar; size: NativeInt; const encoding : PAnsiChar; const errors: PAnsiChar):PPyObject; cdecl;
18871889
PyUnicode_AsEncodedString:function (unicode:PPyObject; const encoding:PAnsiChar; const errors:PAnsiChar):PPyObject; cdecl;
@@ -3977,38 +3979,40 @@ procedure TPythonInterface.MapDll;
39773979
PyString_DecodeEscape :=Import('PyBytes_DecodeEscape');
39783980
PyString_Repr :=Import('PyBytes_Repr');
39793981
end;
3980-
PySys_GetObject :=Import('PySys_GetObject');
3982+
PySys_GetObject :=Import('PySys_GetObject');
39813983
//PySys_Init :=Import('PySys_Init');
3982-
PySys_SetObject :=Import('PySys_SetObject');
3983-
PySys_SetPath :=Import('PySys_SetPath');
3984+
PySys_SetObject :=Import('PySys_SetObject');
3985+
PySys_SetPath :=Import('PySys_SetPath');
39843986
//PyTraceBack_Fetch :=Import('PyTraceBack_Fetch');
3985-
PyTraceBack_Here :=Import('PyTraceBack_Here');
3986-
PyTraceBack_Print :=Import('PyTraceBack_Print');
3987+
PyTraceBack_Here :=Import('PyTraceBack_Here');
3988+
PyTraceBack_Print :=Import('PyTraceBack_Print');
39873989
//@PyTraceBack_Store :=Import('PyTraceBack_Store');
3988-
PyTuple_GetItem :=Import('PyTuple_GetItem');
3989-
PyTuple_GetSlice :=Import('PyTuple_GetSlice');
3990-
PyTuple_New :=Import('PyTuple_New');
3991-
PyTuple_SetItem :=Import('PyTuple_SetItem');
3992-
PyTuple_Size :=Import('PyTuple_Size');
3993-
PyType_IsSubtype :=Import('PyType_IsSubtype');
3994-
PyType_GenericAlloc :=Import('PyType_GenericAlloc');
3995-
PyType_GenericNew :=Import('PyType_GenericNew');
3996-
PyType_Ready :=Import('PyType_Ready');
3997-
PyUnicode_FromWideChar :=Import(AnsiString(Format('PyUnicode%s_FromWideChar',[UnicodeSuffix])));
3998-
PyUnicode_AsWideChar :=Import(AnsiString(Format('PyUnicode%s_AsWideChar',[UnicodeSuffix])));
3999-
PyUnicode_Decode :=Import(AnsiString(Format('PyUnicode%s_Decode',[UnicodeSuffix])));
4000-
PyUnicode_AsEncodedString :=Import(AnsiString(Format('PyUnicode%s_AsEncodedString',[UnicodeSuffix])));
4001-
PyUnicode_FromOrdinal :=Import(AnsiString(Format('PyUnicode%s_FromOrdinal',[UnicodeSuffix])));
4002-
PyUnicode_GetSize :=Import(AnsiString(Format('PyUnicode%s_GetSize',[UnicodeSuffix])));
4003-
PyWeakref_GetObject :=Import('PyWeakref_GetObject');
4004-
PyWeakref_NewProxy :=Import('PyWeakref_NewProxy');
4005-
PyWeakref_NewRef :=Import('PyWeakref_NewRef');
4006-
PyWrapper_New :=Import('PyWrapper_New');
4007-
PyBool_FromLong :=Import('PyBool_FromLong');
4008-
PyThreadState_SetAsyncExc :=Import('PyThreadState_SetAsyncExc');
4009-
Py_AtExit :=Import('Py_AtExit');
3990+
PyTuple_GetItem :=Import('PyTuple_GetItem');
3991+
PyTuple_GetSlice :=Import('PyTuple_GetSlice');
3992+
PyTuple_New :=Import('PyTuple_New');
3993+
PyTuple_SetItem :=Import('PyTuple_SetItem');
3994+
PyTuple_Size :=Import('PyTuple_Size');
3995+
PyType_IsSubtype :=Import('PyType_IsSubtype');
3996+
PyType_GenericAlloc :=Import('PyType_GenericAlloc');
3997+
PyType_GenericNew :=Import('PyType_GenericNew');
3998+
PyType_Ready :=Import('PyType_Ready');
3999+
PyUnicode_FromWideChar :=Import(AnsiString(Format('PyUnicode%s_FromWideChar',[UnicodeSuffix])));
4000+
PyUnicode_FromString :=Import(AnsiString(Format('PyUnicode%s_FromString',[UnicodeSuffix])));
4001+
PyUnicode_FromStringAndSize :=Import(AnsiString(Format('PyUnicode%s_FromStringAndSize',[UnicodeSuffix])));
4002+
PyUnicode_AsWideChar :=Import(AnsiString(Format('PyUnicode%s_AsWideChar',[UnicodeSuffix])));
4003+
PyUnicode_Decode :=Import(AnsiString(Format('PyUnicode%s_Decode',[UnicodeSuffix])));
4004+
PyUnicode_AsEncodedString :=Import(AnsiString(Format('PyUnicode%s_AsEncodedString',[UnicodeSuffix])));
4005+
PyUnicode_FromOrdinal :=Import(AnsiString(Format('PyUnicode%s_FromOrdinal',[UnicodeSuffix])));
4006+
PyUnicode_GetSize :=Import(AnsiString(Format('PyUnicode%s_GetSize',[UnicodeSuffix])));
4007+
PyWeakref_GetObject :=Import('PyWeakref_GetObject');
4008+
PyWeakref_NewProxy :=Import('PyWeakref_NewProxy');
4009+
PyWeakref_NewRef :=Import('PyWeakref_NewRef');
4010+
PyWrapper_New :=Import('PyWrapper_New');
4011+
PyBool_FromLong :=Import('PyBool_FromLong');
4012+
PyThreadState_SetAsyncExc :=Import('PyThreadState_SetAsyncExc');
4013+
Py_AtExit :=Import('Py_AtExit');
40104014
//Py_Cleanup :=Import('Py_Cleanup');
4011-
Py_FatalError :=Import('Py_FatalError');
4015+
Py_FatalError :=Import('Py_FatalError');
40124016
if not IsPython3000 then begin
40134017
Py_FindMethod :=Import('Py_FindMethod');
40144018
Py_FindMethodInChain :=Import('Py_FindMethodInChain');

0 commit comments

Comments
 (0)