Merge branch 'master' of https://github.com/pyscripter/python4delphi

Author: pyscripter

Source/PythonEngine.pas

@@ -2906,9 +2906,9 @@   TPythonThread = class(TThread)
   private class threadvar
     f_savethreadstate: PPyThreadState;
 
+  protected
     // Do not overwrite Execute! Use ExecuteWithPython instead!
     procedure Execute; override;
-  protected
     procedure ExecuteWithPython; virtual; abstract;
     function InterpreterConfig: PyInterpreterConfig; virtual;
   public
@@ -4668,7 +4668,7 @@ procedure TPythonEngine.Initialize;
 
     PWSL := PPyWideStringList(PByte(@Config) + ConfigOffests[MinorVersion,
       TConfigFields.module_search_paths]);
-    Paths := FPythonPath.Split([PathSep]);
+    Paths := string(FPythonPath).Split([PathSep]);
     for I := 0 to Length(Paths) - 1 do
     begin
       if (Paths[I] = '') and (I > 0) then
@@ -9781,7 +9781,7 @@ function StringToWCharTString(Str: string): WcharTString;
   {$IFDEF POSIX}
   Result := UnicodeStringToUCS4String(UnicodeString(Str));
   {$ELSE}
-  Result := Str;
+  Result := WcharTString(Str);
   {$ENDIF}
 end;
 

Source/WrapDelphi.pas

@@ -553,16 +553,16 @@   TPyDelphiObject = class (TPyInterfacedObject, IFreeNotificationSubscriber)
     class function ExcludedExposedMembers(APythonType: TPythonType): TArray<string>; virtual;
     class procedure ExposeMethods(AClass: TClass; NearestAncestorClass: TClass;
       APythonType: TPythonType; APyDelphiWrapper: TPyDelphiWrapper;
-      AExcludedMethodNames: TArray<string> = []);
+      AExcludedMethodNames: TArray<string> = nil);
     class procedure ExposeFields(AClass: TClass; NearestAncestorClass: TClass;
       APythonType: TPythonType; APyDelphiWrapper: TPyDelphiWrapper;
-      AExcludedFieldNames: TArray<string> = []);
+      AExcludedFieldNames: TArray<string> = nil);
     class procedure ExposeProperties(AClass: TClass; NearestAncestorClass: TClass;
       APythonType: TPythonType; APyDelphiWrapper: TPyDelphiWrapper;
-      AExcludedPropertyNames: TArray<string> = []);
+      AExcludedPropertyNames: TArray<string> = nil);
     class procedure ExposeIndexedProperties(AClass: TClass; NearestAncestorClass: TClass;
       APythonType: TPythonType; APyDelphiWrapper: TPyDelphiWrapper;
-      AExcludedPropertyNames: TArray<string> = []);
+      AExcludedPropertyNames: TArray<string> = nil);
     {$ENDIF EXTENDED_RTTI}
   public
     PyDelphiWrapper : TPyDelphiWrapper;
@@ -4290,7 +4290,7 @@ class procedure TPyDelphiObject.ExposeFields(AClass: TClass;
       if Assigned(PyDocServer) and PyDocServer.Initialized and
         PyDocServer.ReadMemberDocStr(LRttiField, LDocStr)
       then
-        LExposedField.DocString := AnsiString(LDocStr);
+        LExposedField.DocString := Utf8Encode(LDocStr);
 
       // Keep it alive until the Wrapper is Finalized
       APyDelphiWrapper.fExposedMembers.Add(LExposedField);
@@ -4377,7 +4377,7 @@ class procedure TPyDelphiObject.ExposeProperties(AClass: TClass;
       if Assigned(PyDocServer) and PyDocServer.Initialized and
         PyDocServer.ReadMemberDocStr(LRttiProperty, LDocStr)
       then
-        LExposedProperty.DocString := AnsiString(LDocStr);
+        LExposedProperty.DocString := Utf8Encode(LDocStr);
 
       // Keep it alive until the Wrapper is Finalized
       APyDelphiWrapper.fExposedMembers.Add(LExposedProperty);
@@ -4460,7 +4460,7 @@ class procedure TPyDelphiObject.ExposeIndexedProperties(AClass: TClass;
       if Assigned(PyDocServer) and PyDocServer.Initialized and
         PyDocServer.ReadMemberDocStr(LRttiProperty, LDocStr)
       then
-        LExposedProperty.DocString := AnsiString(LDocStr);
+        LExposedProperty.DocString := Utf8Encode(LDocStr);
 
       // Keep it alive until the Wrapper is Finalized
       APyDelphiWrapper.fExposedMembers.Add(LExposedProperty);

Source/vcl/WrapVclForms.pas

@@ -1072,7 +1072,7 @@ class procedure TPyDelphiScreen.RegisterMethods(PythonType: TPythonType);
     'Allows forms to be aligned in the screen.');
   PythonType.AddMethod('Realign', @TPyDelphiScreen.Realign_Wrapper,
     'TScreen.Realign()'#10 +
-    'Realigns the screen’s forms according to their Align properties.');
+    'Realigns the screen''s forms according to their Align properties.');
   PythonType.AddMethod('ResetFonts', @TPyDelphiScreen.ResetFonts_Wrapper,
     'TScreen.ResetFonts()'#10 +
     'Reinitializes the fonts listed in the Fonts property.');