Skip to content

Commit fc73aab

Browse files
lmbelolmbelo
committed
Synchronize with upstream
2 parents 3d385c0 + ef41720 commit fc73aab

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+2273
-1732
lines changed

‎Contributors.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
## Contributors
2+
3+
### Fpc and Lazarus support:
4+
- Alexey-T (https://github.com/Alexey-T)
5+
### Early Contributors:
6+
- Grzegorz Makarewicz (mak@mikroplan.com.pl)
7+
- Samuel Iseli (iseli@vertec.ch)
8+
- Andrew Robinson (andy@hps1.demon.co.uk)
9+
- Mark Watts(mark_watts@hotmail.com)
10+
- Olivier Deckmyn (olivier.deckmyn@mail.dotcom.fr)
11+
- Sigve Tjora (public@tjora.no)
12+
- Mark Derricutt (mark@talios.com)
13+
- Igor E. Poteryaev (jah@mail.ru)
14+
- Yuri Filimonov (fil65@mail.ru)
15+
- Stefan Hoffmeister (Stefan.Hoffmeister@Econos.de)
16+
- Michiel du Toit (micdutoit@hsbfn.com) - Lazarus Port
17+
- Chris Nicolai (nicolaitanes@gmail.com)
18+
- Andrey Gruzdev (andrey.gruzdev@gmail.com)
19+
20+
More recent contributors can be seen at the [project contributors graph](https://github.com/pyscripter/python4delphi/graphs/contributors).

‎Packages/Delphi/Delphi 10.4+/PythonFmxLinux.dproj

Lines changed: 968 additions & 968 deletions
Large diffs are not rendered by default.

‎Source/MethodCallBack.pas

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,18 @@
11
(**************************************************************************)
2+
(* This unit is part of the Python for Delphi (P4D) library *)
3+
(* Project home: https://github.com/pyscripter/python4delphi *)
24
(* *)
3-
(* Module: Unit 'MethodCallback' Copyright (c) 1998 *)
4-
(* *)
5-
(* Version: 0.0 Dr. Dietmar Budelsky *)
6-
(* Sub-Version: 0.3 dbudelsky@web.de *)
7-
(* Germany *)
5+
(* Project Maintainer: PyScripter (pyscripter@gmail.com) *)
6+
(* Original Authors: Dr. Dietmar Budelsky (dbudelsky@web.de) *)
7+
(* Morgan Martinet (https://github.com/mmm-experts) *)
8+
(* Core developer: Lucas Belo (lucas.belo@live.com) *)
9+
(* Contributors: See contributors.md at project home *)
810
(* *)
11+
(* LICENCE and Copyright: MIT (see project home) *)
912
(**************************************************************************)
1013
(* Functionality: Generates synthetic callback functions which calls *)
1114
(* DELPHI Class Methods. A callback mechanism (DDE, PYTHON, TCL) can now *)
1215
(* use DELPHI objects. *)
13-
(* *)
14-
(**************************************************************************)
15-
(* Contributors: *)
16-
(* Grzegorz Makarewicz (mak@mikroplan.com.pl) *)
17-
(* Morgan Martinet (p4d@mmm-experts.com) *)
18-
(* Samuel Iseli (iseli@vertec.ch) *)
19-
(* Andrey Gruzdev (andrey.gruzdev@gmail.com) *)
20-
(* Lucas Belo (lucas.belo@live.com) *)
21-
(**************************************************************************)
22-
(* This source code is distributed with no WARRANTY, for no reason or use.*)
23-
(* Everyone is allowed to use and change this code free, as long as this *)
24-
(* header and its copyright text is intact. *)
25-
(* Dr. Dietmar Budelsky, 1998-01-07 *)
2616
(**************************************************************************)
2717

2818
{$I Definition.Inc}

‎Source/PythonAction.pas

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
(**************************************************************************)
2+
(* This unit is part of the Python for Delphi (P4D) library *)
3+
(* Project home: https://github.com/pyscripter/python4delphi *)
4+
(* *)
5+
(* Project Maintainer: PyScripter (pyscripter@gmail.com) *)
6+
(* Original Authors: Dr. Dietmar Budelsky (dbudelsky@web.de) *)
7+
(* Morgan Martinet (https://github.com/mmm-experts) *)
8+
(* Core developer: Lucas Belo (lucas.belo@live.com) *)
9+
(* Contributors: See contributors.md at project home *)
10+
(* *)
11+
(* LICENCE and Copyright: MIT (see project home) *)
12+
(**************************************************************************)
13+
114
unit PythonAction;
215

316
interface

‎Source/PythonEngine.pas

Lines changed: 33 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,14 @@
1-
(**************************************************************************)
2-
(* *)
3-
(* Module: Unit 'PythonEngine' Copyright (c) 1997 *)
4-
(* *)
5-
(* Dr. Dietmar Budelsky *)
6-
(* dbudelsky@web.de *)
7-
(* Germany *)
8-
(* *)
9-
(* Morgan Martinet *)
10-
(* 4723 rue Brebeuf *)
11-
(* H2J 3L2 MONTREAL (QC) *)
12-
(* CANADA *)
13-
(* e-mail: p4d@mmm-experts.com *)
1+
(**************************************************************************)
2+
(* This unit is part of the Python for Delphi (P4D) library *)
3+
(* Project home: https://github.com/pyscripter/python4delphi *)
144
(* *)
15-
(* PyScripter *)
16-
(* e-mail: pyscripter@gmail.com *)
5+
(* Project Maintainer: PyScripter (pyscripter@gmail.com) *)
6+
(* Original Authors: Dr. Dietmar Budelsky (dbudelsky@web.de) *)
7+
(* Morgan Martinet (https://github.com/mmm-experts) *)
8+
(* Core developer: Lucas Belo (lucas.belo@live.com) *)
9+
(* Contributors: See contributors.md at project home *)
1710
(* *)
18-
(* Project page: https://github.com/pyscripter/python4delphi *)
19-
(**************************************************************************)
20-
(* Functionality: Delphi Components that provide an interface to the *)
21-
(* Python language (see python.txt for more infos on *)
22-
(* Python itself). *)
23-
(* *)
24-
(**************************************************************************)
25-
(* Contributors: *)
26-
(* Grzegorz Makarewicz (mak@mikroplan.com.pl) *)
27-
(* Andrew Robinson (andy@hps1.demon.co.uk) *)
28-
(* Mark Watts(mark_watts@hotmail.com) *)
29-
(* Olivier Deckmyn (olivier.deckmyn@mail.dotcom.fr) *)
30-
(* Sigve Tjora (public@tjora.no) *)
31-
(* Mark Derricutt (mark@talios.com) *)
32-
(* Igor E. Poteryaev (jah@mail.ru) *)
33-
(* Yuri Filimonov (fil65@mail.ru) *)
34-
(* Stefan Hoffmeister (Stefan.Hoffmeister@Econos.de) *)
35-
(* Michiel du Toit (micdutoit@hsbfn.com) - Lazarus Port *)
36-
(* Chris Nicolai (nicolaitanes@gmail.com) *)
37-
(* Andrey Gruzdev (andrey.gruzdev@gmail.com) *)
38-
(**************************************************************************)
39-
(* This source code is distributed with no WARRANTY, for no reason or use.*)
40-
(* Everyone is allowed to use and change this code free for his own tasks *)
41-
(* and projects, as long as this header and its copyright text is intact. *)
42-
(* For changed versions of this code, which are public distributed the *)
43-
(* following additional conditions have to be fullfilled: *)
44-
(* 1) The header has to contain a comment on the change and the author of *)
45-
(* it. *)
46-
(* 2) A copy of the changed source has to be sent to the above E-Mail *)
47-
(* address or my then valid address, if this is possible to the *)
48-
(* author. *)
49-
(* The second condition has the target to maintain an up to date central *)
50-
(* version of the component. If this condition is not acceptable for *)
51-
(* confidential or legal reasons, everyone is free to derive a component *)
52-
(* or to generate a diff file to my or other original sources. *)
53-
(* Dr. Dietmar Budelsky, 1997-11-17 *)
11+
(* LICENCE and Copyright: MIT (see project home) *)
5412
(**************************************************************************)
5513

5614
{$I Definition.Inc}
@@ -1958,8 +1916,9 @@ TPythonEngine = class(TPythonInterface)
19581916
function ArrayToPyDict( const items : array of const) : PPyObject;
19591917
function StringsToPyList( strings : TStrings ) : PPyObject;
19601918
function StringsToPyTuple( strings : TStrings ) : PPyObject;
1961-
procedure PyListToStrings(list: PPyObject; Strings: TStrings; ClearStrings: Boolean = True);
1919+
procedure PyListToStrings(list: PPyObject; Strings: TStrings; ClearStrings: Boolean = True);
19621920
procedure PyTupleToStrings( tuple: PPyObject; strings : TStrings );
1921+
function GetSequenceItem( sequence : PPyObject; idx : Integer ) : Variant;
19631922
function ReturnNone : PPyObject;
19641923
function ReturnTrue : PPyObject;
19651924
function ReturnFalse : PPyObject;
@@ -4691,7 +4650,7 @@ procedure TPythonEngine.SetProgramArgs;
46914650
for I := 0 to argc do begin
46924651
{
46934652
... the first entry should refer to the script file to be executed rather
4694-
than the executable hosting the Python interpreter. If there isn’t a
4653+
than the executable hosting the Python interpreter. If there isn’t a
46954654
script that will be run, the first entry in argv can be an empty string.
46964655
}
46974656
if I = 0 then
@@ -4795,6 +4754,19 @@ function TPythonEngine.GetPythonPath: UnicodeString;
47954754
{$ENDIF}
47964755
end;
47974756

4757+
function TPythonEngine.GetSequenceItem(sequence: PPyObject;
4758+
idx: Integer): Variant;
4759+
var
4760+
val : PPyObject;
4761+
begin
4762+
val := PySequence_GetItem( sequence, idx );
4763+
try
4764+
Result := PyObjectAsVariant( val );
4765+
finally
4766+
Py_XDecRef( val );
4767+
end;
4768+
end;
4769+
47984770
function TPythonEngine.GetProgramName: UnicodeString;
47994771
begin
48004772
{$IFDEF POSIX}
@@ -5752,18 +5724,6 @@ function TPythonEngine.PyObjectAsVariant( obj : PPyObject ) : Variant;
57525724
end;
57535725
end;
57545726

5755-
function GetSequenceItem( sequence : PPyObject; idx : Integer ) : Variant;
5756-
var
5757-
val : PPyObject;
5758-
begin
5759-
val := PySequence_GetItem( sequence, idx );
5760-
try
5761-
Result := PyObjectAsVariant( val );
5762-
finally
5763-
Py_XDecRef( val );
5764-
end;
5765-
end;
5766-
57675727
var
57685728
i, seq_length : Integer;
57695729
begin
@@ -6091,7 +6051,8 @@ function TPythonEngine.PyUnicodeAsString(obj : PPyObject): UnicodeString;
60916051
Exit;
60926052

60936053
// The second argument is the size of the destination (Result) including #0
6094-
NewSize := Utf8ToUnicode(PChar(Result), Cardinal(Size + 1), Buffer, Cardinal(Size));
6054+
NewSize := Utf8ToUnicode(PWideChar(Result), Cardinal(Size + 1), Buffer, Cardinal(Size));
6055+
60956056
// NewSize includes #0
60966057
SetLength(Result, NewSize - 1);
60976058
end
@@ -6395,6 +6356,10 @@ constructor TEngineClient.Create( AOwner : TComponent );
63956356

63966357
destructor TEngineClient.Destroy;
63976358
begin
6359+
// if the client is destroyed before the Python Engine then
6360+
// we need to finalize it. Otherwise it will already be finalized
6361+
if FInitialized then
6362+
Finalize;
63986363
Engine := nil; // This detaches the client from the Engine.
63996364
if Assigned( FOnDestroy ) then
64006365
FOnDestroy( Self );
@@ -8684,7 +8649,8 @@ procedure TPythonType.Initialize;
86848649

86858650
procedure TPythonType.Finalize;
86868651
begin
8687-
Engine.Py_CLEAR(FCreateFunc);
8652+
if Assigned(Engine) then
8653+
Engine.Py_CLEAR(FCreateFunc);
86888654
FCreateFunc := nil;
86898655
inherited;
86908656
end;

‎Source/PythonVersions.pas

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1-
{-----------------------------------------------------------------------------
2-
Unit Name: PythonVersions
3-
Author: PyScripter
4-
Purpose: Discover and get info about Python versions
5-
Part of the Python for Delphi library
6-
7-
History:
8-
-----------------------------------------------------------------------------}
1+
(**************************************************************************)
2+
(* This unit is part of the Python for Delphi (P4D) library *)
3+
(* Project home: https://github.com/pyscripter/python4delphi *)
4+
(* *)
5+
(* Project Maintainer: PyScripter (pyscripter@gmail.com) *)
6+
(* Original Authors: Dr. Dietmar Budelsky (dbudelsky@web.de) *)
7+
(* Morgan Martinet (https://github.com/mmm-experts) *)
8+
(* Core developer: Lucas Belo (lucas.belo@live.com) *)
9+
(* Contributors: See contributors.md at project home *)
10+
(* *)
11+
(* LICENCE and Copyright: MIT (see project home) *)
12+
(**************************************************************************)
13+
(* Purpose: Discover and get info about Python versions *)
14+
(**************************************************************************)
915

1016
unit PythonVersions;
1117

‎Source/VarPyth.pas

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,25 @@
1-
{$I Definition.Inc}
2-
3-
unit VarPyth;
4-
51
(**************************************************************************)
2+
(* This unit is part of the Python for Delphi (P4D) library *)
3+
(* Project home: https://github.com/pyscripter/python4delphi *)
64
(* *)
7-
(* Module: Unit 'VarPyth' Copyright (c) 2001 *)
8-
(* *)
9-
(* Version: 1.0 Morgan Martinet *)
10-
(* Sub-Version: 0.7 4723 rue Brebeuf *)
11-
(* H2J 3L2 MONTREAL (QC) *)
12-
(* CANADA *)
13-
(* e-mail: p4d@mmm-experts.com *)
5+
(* Project Maintainer: PyScripter (pyscripter@gmail.com) *)
6+
(* Original Authors: Dr. Dietmar Budelsky (dbudelsky@web.de) *)
7+
(* Morgan Martinet (https://github.com/mmm-experts) *)
8+
(* Core developer: Lucas Belo (lucas.belo@live.com) *)
9+
(* Contributors: See contributors.md at project home *)
1410
(* *)
11+
(* LICENCE and Copyright: MIT (see project home) *)
1512
(**************************************************************************)
1613
(* Functionality: This allows you to use Python objects like COM *)
1714
(* automation objects, inside your Delphi source code. *)
1815
(* This is a replacement of the former PythonAtom.pas *)
1916
(* that uses the new custom variant types introduced *)
2017
(* in Delphi6. *)
2118
(**************************************************************************)
22-
(* Contributors: *)
23-
(**************************************************************************)
24-
(* This source code is distributed with no WARRANTY, for no reason or use.*)
25-
(* Everyone is allowed to use and change this code free for his own tasks *)
26-
(* and projects, as long as this header and its copyright text is intact. *)
27-
(* For changed versions of this code, which are public distributed the *)
28-
(* following additional conditions have to be fullfilled: *)
29-
(* 1) The header has to contain a comment on the change and the author of *)
30-
(* it. *)
31-
(* 2) A copy of the changed source has to be sent to the above E-Mail *)
32-
(* address or my then valid address, if this is possible to the *)
33-
(* author. *)
34-
(* The second condition has the target to maintain an up to date central *)
35-
(* version of the component. If this condition is not acceptable for *)
36-
(* confidential or legal reasons, everyone is free to derive a component *)
37-
(* or to generate a diff file to my or other original sources. *)
38-
(**************************************************************************)
19+
20+
{$I Definition.Inc}
21+
22+
unit VarPyth;
3923

4024
interface
4125

‎Source/WrapActions.pas

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
(**************************************************************************)
2+
(* This unit is part of the Python for Delphi (P4D) library *)
3+
(* Project home: https://github.com/pyscripter/python4delphi *)
4+
(* *)
5+
(* Project Maintainer: PyScripter (pyscripter@gmail.com) *)
6+
(* Original Authors: Dr. Dietmar Budelsky (dbudelsky@web.de) *)
7+
(* Morgan Martinet (https://github.com/mmm-experts) *)
8+
(* Core developer: Lucas Belo (lucas.belo@live.com) *)
9+
(* Contributors: See contributors.md at project home *)
10+
(* *)
11+
(* LICENCE and Copyright: MIT (see project home) *)
12+
(**************************************************************************)
13+
114
unit WrapActions;
215

316
interface

0 commit comments

Comments
 (0)