Skip to content

Commit 9b4e1f8

Browse files
pyscripterpyscripter
committed
Fix #205 
1 parent 6921385 commit 9b4e1f8

File tree

23 files changed

+149
-159
lines changed

23 files changed

+149
-159
lines changed

‎Demos/Demo06/Unit1.pas‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ function PyPoint_getattr(obj : PPyObject; key : PAnsiChar) : PPyObject; cdecl;
163163
else
164164
begin
165165
// Else check for a method
166-
Result := PyObject_GenericGetAttr(obj, PyUnicode_FromAnsiString(key));
166+
Result := PyObject_GenericGetAttr(obj, PyUnicodeFromString(key));
167167
if not Assigned(Result) then
168168
PyErr_SetString (PyExc_AttributeError^, PAnsiChar(Format('Unknown attribute "%s"',[key])));
169169
end;
@@ -206,7 +206,7 @@ function PyPoint_repr(obj : PPyObject) : PPyObject; cdecl;
206206
begin
207207
with GetPythonEngine, PPyPoint(obj)^ do
208208
begin
209-
Result := PyUnicode_FromAnsiString(Format('(%d, %d)',[po_x, po_y]));
209+
Result := PyUnicodeFromString(Format('(%d, %d)',[po_x, po_y]));
210210
end;
211211
end;
212212

‎Demos/Demo07/Unit1.pas‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ function PyPoint_getattr(obj : PPyObject; key : PAnsiChar) : PPyObject; cdecl;
203203
else
204204
begin
205205
// Else check for a method
206-
Result := PyObject_GenericGetAttr(obj, PyUnicode_FromAnsiString(key));
206+
Result := PyObject_GenericGetAttr(obj, PyUnicodeFromString(key));
207207
if not Assigned(Result) then
208208
PyErr_SetString (PyExc_AttributeError^, PAnsiChar(Format('Unknown attribute "%s"',[key])));
209209
end;
@@ -246,7 +246,7 @@ function PyPoint_repr(obj : PPyObject) : PPyObject; cdecl;
246246
begin
247247
with GetPythonEngine, PPyPoint(obj)^ do
248248
begin
249-
Result := PyUnicode_FromAnsiString(Format('(%d, %d)',[po_x, po_y]));
249+
Result := PyUnicodeFromString(Format('(%d, %d)',[po_x, po_y]));
250250
end;
251251
end;
252252

‎Demos/Demo16/Example2/Unit1.pas‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,12 @@ function TForm1.GetPropertyList(pSelf, Args : PPyObject) : PPyObject; cdecl;
149149
with GetPythonEngine do
150150
begin
151151
Result := PyList_New(6);
152-
PyList_SetItem(Result, 0, PyUnicode_FromAnsiString('Title'));
153-
PyList_SetItem(Result, 1, PyUnicode_FromAnsiString('Name'));
154-
PyList_SetItem(Result, 2, PyUnicode_FromAnsiString('Informatician'));
155-
PyList_SetItem(Result, 3, PyUnicode_FromAnsiString('PythonUser'));
156-
PyList_SetItem(Result, 4, PyUnicode_FromAnsiString('Age'));
157-
PyList_SetItem(Result, 5, PyUnicode_FromAnsiString('Sex'));
152+
PyList_SetItem(Result, 0, PyUnicodeFromString('Title'));
153+
PyList_SetItem(Result, 1, PyUnicodeFromString('Name'));
154+
PyList_SetItem(Result, 2, PyUnicodeFromString('Informatician'));
155+
PyList_SetItem(Result, 3, PyUnicodeFromString('PythonUser'));
156+
PyList_SetItem(Result, 4, PyUnicodeFromString('Age'));
157+
PyList_SetItem(Result, 5, PyUnicodeFromString('Sex'));
158158
end;
159159
end;
160160

‎Demos/Demo21/Unit1.pas‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ function TPyPoint.Repr : PPyObject;
132132
begin
133133
with GetPythonEngine do
134134
Result := VariantAsPyObject(Format('(%d, %d)',[x, y]));
135-
// or Result := PyUnicode_FromAnsiString(Format('(%d, %d)',[x, y]));
135+
// or Result := PyUnicodeFromString(Format('(%d, %d)',[x, y]));
136136
end;
137137

138138
// Methods of TPyPoint
@@ -178,7 +178,7 @@ procedure TForm1.PythonModule1Events0Execute(Sender: TObject; PSelf,
178178
begin
179179
with GetPythonEngine do
180180
begin
181-
Result := PyUnicode_FromAnsiString('Hello world !');
181+
Result := PyUnicodeFromString('Hello world !');
182182
end;
183183
end;
184184

‎Demos/Demo25/fmMain.pas‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ procedure TMain.btnTestStringsClick(Sender: TObject);
497497
Assert( w = 'Hello world!');
498498
Assert( b = 'Hello world!');
499499
Assert( b <> a );
500-
_obj := PythonEngine1.PyUnicode_FromWideString(w);
500+
_obj := PythonEngine1.PyUnicodeFromString(w);
501501
try
502502
c := VarPythonCreate( _obj );
503503
finally

‎Demos/Demo26/Unit1.pas‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,14 @@ function TPyPoint.Repr : PPyObject;
100100
begin
101101
with GetPythonEngine do
102102
Result := VariantAsPyObject(Format('(%d, %d)',[x, y]));
103-
// or Result := PyUnicode_FromAnsiString(Format('(%d, %d)',[x, y]));
103+
// or Result := PyUnicodeFromString(Format('(%d, %d)',[x, y]));
104104
end;
105105

106106
// get/set functions
107107
function TPyPoint_GetName( obj : PPyObject; context : Pointer) : PPyObject; cdecl;
108108
begin
109109
with GetPythonEngine do
110-
Result := PyUnicode_FromAnsiString(AnsiString(TPyPoint(PythonToDelphi(obj)).Name));
110+
Result := PyUnicodeFromString(TPyPoint(PythonToDelphi(obj)).Name);
111111
end;
112112

113113
function TPyPoint_SetName( obj, value : PPyObject; context : Pointer) : integer; cdecl;

‎Demos/Demo28/Unit1.pas‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ function TPyStringList.SqItem(idx: NativeInt): PPyObject;
218218
with GetPythonEngine do
219219
begin
220220
if idx < Strings.Count then
221-
Result := PyUnicode_FromAnsiString(AnsiString(Strings[idx]))
221+
Result := PyUnicodeFromString(Strings[idx])
222222
else
223223
begin
224224
PyErr_SetString(PyExc_IndexError^, 'list index out of range');
@@ -280,7 +280,7 @@ function TPyStringListIterator.IterNext: PPyObject;
280280
end
281281
else
282282
begin
283-
Result := PyUnicode_FromAnsiString(AnsiString(StringList.Strings[fCurrentIndex]));
283+
Result := PyUnicodeFromString(StringList.Strings[fCurrentIndex]);
284284
end;
285285
end;
286286
end;

‎Demos/Demo32/Unit1.pas‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ function TPyPoint.Repr : PPyObject;
127127
begin
128128
with GetPythonEngine, DelphiObject as TPoint do
129129
Result := VariantAsPyObject(Format('(%d, %d)',[x, y]));
130-
// or Result := PyUnicode_FromAnsiString(Format('(%d, %d)',[x, y]));
130+
// or Result := PyUnicodeFromString(Format('(%d, %d)',[x, y]));
131131
end;
132132

133133
/////////////////////////////////////////////////

‎Demos/Demo34/Unit1.pas‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,14 +177,14 @@ function TPyPoint.Repr : PPyObject;
177177
begin
178178
with GetPythonEngine do
179179
Result := VariantAsPyObject(Format('(%d, %d)',[x, y]));
180-
// or Result := PyUnicode_FromAnsiString(Format('(%d, %d)',[x, y]));
180+
// or Result := PyUnicodeFromString(Format('(%d, %d)',[x, y]));
181181
end;
182182

183183
// get/set functions
184184
function TPyPoint_GetName( obj : PPyObject; context : Pointer) : PPyObject; cdecl;
185185
begin
186186
with GetPythonEngine do
187-
Result := PyUnicode_FromAnsiString(AnsiString(TPyPoint(PythonToDelphi(obj)).Name));
187+
Result := PyUnicodeFromString(TPyPoint(PythonToDelphi(obj)).Name);
188188
end;
189189

190190
function TPyPoint_SetName( obj, value : PPyObject; context : Pointer) : integer; cdecl;

‎Demos/FPC/Demo06/Unit1.pas‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ function PyPoint_getattr(obj : PPyObject; key : PAnsiChar) : PPyObject; cdecl;
168168
else
169169
begin
170170
// Else check for a method
171-
Result := PyObject_GenericGetAttr(obj, PyUnicode_FromAnsiString(key));
171+
Result := PyObject_GenericGetAttr(obj, PyUnicodeFromString(key));
172172
if not Assigned(Result) then
173173
PyErr_SetString (PyExc_AttributeError^, PAnsiChar(Format('Unknown attribute "%s"',[key])));
174174
end;
@@ -211,7 +211,7 @@ function PyPoint_repr(obj : PPyObject) : PPyObject; cdecl;
211211
begin
212212
with GetPythonEngine, PPyPoint(obj)^ do
213213
begin
214-
Result := PyUnicode_FromAnsiString(Format('(%d, %d)',[po_x, po_y]));
214+
Result := PyUnicodeFromString(Format('(%d, %d)',[po_x, po_y]));
215215
end;
216216
end;
217217

0 commit comments

Comments
 (0)