Merging with master branch

lmbelo · lmbelo · commit 05a90df7bd5e · 2022-05-18T12:33:24.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -58,3 +58,4 @@ __recovery/
 /Modules/DelphiFMX/dcu
 /Modules/DelphiVCL/dcu
 Release/
+*.a
diff --git a/Packages/Delphi/Delphi 10.4+/dclPython.dres b/Packages/Delphi/Delphi 10.4+/dclPython.dres
diff --git a/Source/VarPyth.pas b/Source/VarPyth.pas
@@ -40,7 +40,7 @@
 interface
 
 uses
-  Variants, PythonEngine;
+  Variants, PythonEngine, Classes;
 
 type
   TSequenceType = (stTuple, stList);
@@ -135,10 +135,12 @@   TVarPyEnumerateHelper = record
 
 function VarPyIterate(const AValue: Variant): TVarPyEnumerateHelper;
 
+function VarPyToStrings(const AValue : Variant; const AStrings: TStrings): Integer;
+
 implementation
 
 uses
-  VarUtils, SysUtils, TypInfo, Classes;
+  VarUtils, SysUtils, TypInfo;
 
 type
   TNamedParamDesc = record
@@ -289,6 +291,7 @@   TPythonData = class(TObject)
   SCantConvertValueToPythonObject = 'Can''t convert Value into a Python object';
   SCantCreateNewSequenceObject = 'Can''t create a new sequence object';
   SExpectedPythonVariant = 'Expected a Python variant';
+  SExpectedPythonList = 'Expected a Python List: ';
 
 { Python variant creation utils }
 
@@ -2816,6 +2819,17 @@ function TVarPyEnumerateHelper.GetEnumerator: TVarPyEnumerator;
   Result := TVarPyEnumerator.Create(FIterable);
 end;
 
+function VarPyToStrings(const AValue : Variant; const AStrings: TStrings): Integer;
+begin
+  Assert(Assigned(AStrings));
+  if VarIsPythonList(AValue) then
+    GetPythonEngine.PyListToStrings(
+      ExtractPythonObjectFrom(AValue), AStrings)
+  else
+    raise Exception.Create(SExpectedPythonList + _type(AValue));
+  Result := AStrings.Count;
+end;
+
 initialization
   PythonVariantType := TPythonVariantType.Create;
 
diff --git a/Tutorials/Webinar I/Python4Delphi(Part1).pdf b/Tutorials/Webinar I/Python4Delphi(Part1).pdf
diff --git a/Tutorials/Webinar I/README.md b/Tutorials/Webinar I/README.md
@@ -7,6 +7,6 @@
 
 - [Video replay](https://youtu.be/aCz5h96ObUM)
 
-- [Slides](https://www.slideshare.net/embarcaderotechnet/python-for-delphi-developers-part-1-introduction)
+- [Slides](Python4Delphi(Part1).pdf)
 
-- Source code included in this folder
+- Source code included in this folder
diff --git a/Tutorials/Webinar II/README.md b/Tutorials/Webinar II/README.md
@@ -7,7 +7,7 @@
 
 - [Video replay](https://blogs.embarcadero.com/combining-the-strengths-of-delphi-and-python/)
 
-- [Slides]()
+- [Slides](Python%20for%20Delphi%20Developers%20II.pdf)
 
 - Source code is included in this folder.  [Demo33](https://github.com/pyscripter/python4delphi/tree/master/Demos/Demo33) is in the Demos directory and the python extension [module demos](https://github.com/pyscripter/python4delphi/tree/master/Modules/DemoModule) are in the Modules directory.
 
