@@ -3643,7 +3643,12 @@ function TPythonInterface.GetUnicodeTypeSuffix : String;
36433643end ;
36443644
36453645procedure TPythonInterface.MapDll ;
3646+ Var
3647+ UnicodeSuffix : string;
3648+
36463649begin
3650+ UnicodeSuffix := GetUnicodeTypeSuffix;
3651+
36473652 Py_DebugFlag := Import (' Py_DebugFlag' );
36483653 Py_VerboseFlag := Import (' Py_VerboseFlag' );
36493654 Py_InteractiveFlag := Import (' Py_InteractiveFlag' );
@@ -4055,12 +4060,12 @@ procedure TPythonInterface.MapDll;
40554060 PyType_GenericAlloc :=Import (' PyType_GenericAlloc' );
40564061 PyType_GenericNew :=Import (' PyType_GenericNew' );
40574062 PyType_Ready :=Import (' PyType_Ready' );
4058- PyUnicode_FromWideChar :=Import (AnsiString(Format(' PyUnicode%s_FromWideChar' ,[GetUnicodeTypeSuffix ])));
4059- PyUnicode_AsWideChar :=Import (AnsiString(Format(' PyUnicode%s_AsWideChar' ,[GetUnicodeTypeSuffix ])));
4060- PyUnicode_Decode :=Import (AnsiString(Format(' PyUnicode%s_Decode' ,[GetUnicodeTypeSuffix ])));
4061- PyUnicode_AsEncodedString :=Import (AnsiString(Format(' PyUnicode%s_AsEncodedString' ,[GetUnicodeTypeSuffix ])));
4062- PyUnicode_FromOrdinal :=Import (AnsiString(Format(' PyUnicode%s_FromOrdinal' ,[GetUnicodeTypeSuffix ])));
4063- PyUnicode_GetSize :=Import (AnsiString(Format(' PyUnicode%s_GetSize' ,[GetUnicodeTypeSuffix ])));
4063+ PyUnicode_FromWideChar :=Import (AnsiString(Format(' PyUnicode%s_FromWideChar' ,[UnicodeSuffix ])));
4064+ PyUnicode_AsWideChar :=Import (AnsiString(Format(' PyUnicode%s_AsWideChar' ,[UnicodeSuffix ])));
4065+ PyUnicode_Decode :=Import (AnsiString(Format(' PyUnicode%s_Decode' ,[UnicodeSuffix ])));
4066+ PyUnicode_AsEncodedString :=Import (AnsiString(Format(' PyUnicode%s_AsEncodedString' ,[UnicodeSuffix ])));
4067+ PyUnicode_FromOrdinal :=Import (AnsiString(Format(' PyUnicode%s_FromOrdinal' ,[UnicodeSuffix ])));
4068+ PyUnicode_GetSize :=Import (AnsiString(Format(' PyUnicode%s_GetSize' ,[UnicodeSuffix ])));
40644069 PyWeakref_GetObject :=Import (' PyWeakref_GetObject' );
40654070 PyWeakref_NewProxy :=Import (' PyWeakref_NewProxy' );
40664071 PyWeakref_NewRef :=Import (' PyWeakref_NewRef' );
0 commit comments