Skip to content

Commit cd581ae

Browse files
committed
Removed PYTHON23
PyInterpreterState and PyThreadState stuctures changed in recent Python versions Improved TPythonThread and updated Demos 11 and 33 TGUIPythonInputOutput should now work with threads if DelayWrites is set. Fixed complilation of PythonVersions.pas
1 parent 11e07af commit cd581ae

File tree

9 files changed

+351
-267
lines changed

9 files changed

+351
-267
lines changed

PythonForDelphi/Components/Sources/Core/Definition.Inc

+2-20
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@
2626
// modify the default Python version below, in the Python versions section.
2727
/////////////////////////////////////////////////////////////////////////////
2828

29-
//{$DEFINE PYTHON23}
3029
//{$DEFINE PYTHON24}
31-
{$DEFINE PYTHON25}
32-
//{$DEFINE PYTHON26}
30+
//{$DEFINE PYTHON25}
31+
{$DEFINE PYTHON26`}
3332
//{$DEFINE PYTHON27}
3433
//{$DEFINE PYTHON30}
3534
//{$DEFINE PYTHON31}
@@ -406,11 +405,9 @@
406405
{$IFNDEF PYTHON26}
407406
{$IFNDEF PYTHON25}
408407
{$IFNDEF PYTHON24}
409-
{$IFNDEF PYTHON23}
410408
{---<START OF DEFAULT PYTHON VERSION>---}
411409
{$DEFINE PYTHON27}
412410
{---<END OF DEFAULT PYTHON VERSION>---}
413-
{$ENDIF}
414411
{$ENDIF}
415412
{$ENDIF}
416413
{$ENDIF}
@@ -425,41 +422,32 @@
425422
{$ENDIF}
426423

427424

428-
{$IFDEF PYTHON23}
429-
{$DEFINE PYTHON23_OR_HIGHER}
430-
{$ENDIF}
431425
{$IFDEF PYTHON24}
432-
{$DEFINE PYTHON23_OR_HIGHER}
433426
{$DEFINE PYTHON24_OR_HIGHER}
434427
{$ENDIF}
435428
{$IFDEF PYTHON25}
436-
{$DEFINE PYTHON23_OR_HIGHER}
437429
{$DEFINE PYTHON24_OR_HIGHER}
438430
{$DEFINE PYTHON25_OR_HIGHER}
439431
{$ENDIF}
440432
{$IFDEF PYTHON26}
441-
{$DEFINE PYTHON23_OR_HIGHER}
442433
{$DEFINE PYTHON24_OR_HIGHER}
443434
{$DEFINE PYTHON25_OR_HIGHER}
444435
{$DEFINE PYTHON26_OR_HIGHER}
445436
{$ENDIF}
446437
{$IFDEF PYTHON27}
447-
{$DEFINE PYTHON23_OR_HIGHER}
448438
{$DEFINE PYTHON24_OR_HIGHER}
449439
{$DEFINE PYTHON25_OR_HIGHER}
450440
{$DEFINE PYTHON26_OR_HIGHER}
451441
{$DEFINE PYTHON27_OR_HIGHER}
452442
{$ENDIF}
453443
{$IFDEF PYTHON30}
454-
{$DEFINE PYTHON23_OR_HIGHER}
455444
{$DEFINE PYTHON24_OR_HIGHER}
456445
{$DEFINE PYTHON25_OR_HIGHER}
457446
{$DEFINE PYTHON26_OR_HIGHER}
458447
{$DEFINE PYTHON27_OR_HIGHER}
459448
{$DEFINE PYTHON30_OR_HIGHER}
460449
{$ENDIF}
461450
{$IFDEF PYTHON31}
462-
{$DEFINE PYTHON23_OR_HIGHER}
463451
{$DEFINE PYTHON24_OR_HIGHER}
464452
{$DEFINE PYTHON25_OR_HIGHER}
465453
{$DEFINE PYTHON26_OR_HIGHER}
@@ -468,7 +456,6 @@
468456
{$DEFINE PYTHON31_OR_HIGHER}
469457
{$ENDIF}
470458
{$IFDEF PYTHON32}
471-
{$DEFINE PYTHON23_OR_HIGHER}
472459
{$DEFINE PYTHON24_OR_HIGHER}
473460
{$DEFINE PYTHON25_OR_HIGHER}
474461
{$DEFINE PYTHON26_OR_HIGHER}
@@ -478,7 +465,6 @@
478465
{$DEFINE PYTHON32_OR_HIGHER}
479466
{$ENDIF}
480467
{$IFDEF PYTHON33}
481-
{$DEFINE PYTHON23_OR_HIGHER}
482468
{$DEFINE PYTHON24_OR_HIGHER}
483469
{$DEFINE PYTHON25_OR_HIGHER}
484470
{$DEFINE PYTHON26_OR_HIGHER}
@@ -489,7 +475,6 @@
489475
{$DEFINE PYTHON33_OR_HIGHER}
490476
{$ENDIF}
491477
{$IFDEF PYTHON34}
492-
{$DEFINE PYTHON23_OR_HIGHER}
493478
{$DEFINE PYTHON24_OR_HIGHER}
494479
{$DEFINE PYTHON25_OR_HIGHER}
495480
{$DEFINE PYTHON26_OR_HIGHER}
@@ -501,7 +486,6 @@
501486
{$DEFINE PYTHON34_OR_HIGHER}
502487
{$ENDIF}
503488
{$IFDEF PYTHON35}
504-
{$DEFINE PYTHON23_OR_HIGHER}
505489
{$DEFINE PYTHON24_OR_HIGHER}
506490
{$DEFINE PYTHON25_OR_HIGHER}
507491
{$DEFINE PYTHON26_OR_HIGHER}
@@ -514,7 +498,6 @@
514498
{$DEFINE PYTHON35_OR_HIGHER}
515499
{$ENDIF}
516500
{$IFDEF PYTHON36}
517-
{$DEFINE PYTHON23_OR_HIGHER}
518501
{$DEFINE PYTHON24_OR_HIGHER}
519502
{$DEFINE PYTHON25_OR_HIGHER}
520503
{$DEFINE PYTHON26_OR_HIGHER}
@@ -528,7 +511,6 @@
528511
{$DEFINE PYTHON36_OR_HIGHER}
529512
{$ENDIF}
530513
{$IFDEF PYTHON37}
531-
{$DEFINE PYTHON23_OR_HIGHER}
532514
{$DEFINE PYTHON24_OR_HIGHER}
533515
{$DEFINE PYTHON25_OR_HIGHER}
534516
{$DEFINE PYTHON26_OR_HIGHER}

0 commit comments

Comments
 (0)