Skip to content

Commit 62eab06

Browse files
committed
addressed code review comments by pyscripter.
1 parent 8a726f5 commit 62eab06

File tree

3 files changed

+6
-15
lines changed

3 files changed

+6
-15
lines changed

Source/PythonEngine.pas

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6066,11 +6066,8 @@ function TPythonEngine.PyUnicodeAsString(obj : PPyObject): UnicodeString;
60666066
Exit;
60676067

60686068
// The second argument is the size of the destination (Result) including #0
6069-
{$IFDEF FPC}
6070-
NewSize := Utf8ToUnicode(PUnicodeChar(Result), Cardinal(Size + 1), Buffer, Cardinal(Size));
6071-
{$ELSE}
6072-
NewSize := Utf8ToUnicode(PChar(Result), Cardinal(Size + 1), Buffer, Cardinal(Size));
6073-
{$ENDIF}
6069+
NewSize := Utf8ToUnicode(PWideChar(Result), Cardinal(Size + 1), Buffer, Cardinal(Size));
6070+
60746071
// NewSize includes #0
60756072
SetLength(Result, NewSize - 1);
60766073
end

Source/WrapDelphi.pas

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2573,6 +2573,8 @@ function TPyDelphiObject.Dir_Wrapper(args: PPyObject): PPyObject;
25732573
PyType: PPyTypeObject;
25742574
{$IFDEF FPC}
25752575
i: longint;
2576+
{$ELSE}
2577+
i: integer;
25762578
{$ENDIF}
25772579
{$IFDEF EXTENDED_RTTI}
25782580
Context: TRttiContext;

Source/WrapDelphiClasses.pas

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2392,22 +2392,14 @@ TResourceStreamClass = class of TResourceStream;
23922392
{$ELSE}
23932393
if APythonType.Engine.PyArg_ParseTuple(args, 'Iss:Create', @LHandle, @LResName, @LResType) <> 0 then
23942394
{$ENDIF}
2395-
{$IFDEF FPC}
2396-
DelphiObject := TResourceStreamClass(DelphiObjectClass).Create(LHandle, String(LResName), PChar(String(LResType)))
2397-
{$ELSE}
2398-
DelphiObject := TResourceStreamClass(DelphiObjectClass).Create(LHandle, String(LResName), PWideChar(String(LResType)))
2399-
{$ENDIF}
2395+
DelphiObject := TResourceStreamClass(DelphiObjectClass).Create(LHandle, String(LResName), PChar(String(LResType)))
24002396
else
24012397
{$IFDEF CPUX64}
24022398
if APythonType.Engine.PyArg_ParseTuple(args, 'Kis:Create', @LHandle, @LResId, @LResType) <> 0 then
24032399
{$ELSE}
24042400
if APythonType.Engine.PyArg_ParseTuple(args, 'Iis:Create', @LHandle, @LResId, @LResType) <> 0 then
24052401
{$ENDIF}
2406-
{$IFDEF FPC}
2407-
DelphiObject := TResourceStreamClass(DelphiObjectClass).CreateFromID(LHandle, LResId, PChar(String(LResType)));
2408-
{$ELSE}
2409-
DelphiObject := TResourceStreamClass(DelphiObjectClass).CreateFromID(LHandle, LResId, PWideChar(String(LResType)));
2410-
{$ENDIF}
2402+
DelphiObject := TResourceStreamClass(DelphiObjectClass).CreateFromID(LHandle, LResId, PChar(String(LResType)));
24112403
except
24122404
on E: Exception do
24132405
with GetPythonEngine do

0 commit comments

Comments
 (0)