Fix pyscripter#107

Author: pyscripter

PythonForDelphi/Components/Sources/Core/PythonEngine.pas

@@ -1517,7 +1517,6 @@   TPythonInterface=class(TDynamicDll)
     FMajorVersion:   integer;
     FMinorVersion:   integer;
     FBuiltInModuleName: string;
-    function GetInitialized: Boolean;
 
     procedure AfterLoad; override;
     function  GetQuitMessage : string; override;
@@ -2067,13 +2066,12 @@   TPythonInterface=class(TDynamicDll)
   procedure MapDll;
 
   // Public properties
-  property Initialized : Boolean read GetInitialized;
+  property Initialized : Boolean read FInitialized;
   property Finalizing : Boolean read FFinalizing;
   property IsPython3000 : Boolean read FIsPython3000;
   property MajorVersion : integer read FMajorVersion;
   property MinorVersion : integer read FMinorVersion;
   property BuiltInModuleName: string read FBuiltInModuleName write FBuiltInModuleName;
-
 end;
 
 //--------------------------------------------------------
@@ -3516,6 +3514,7 @@ constructor TPythonInterface.Create(AOwner: TComponent);
   i : Integer;
 begin
   inherited;
+  FInitialized := False;
   i := COMPILED_FOR_PYTHON_VERSION_INDEX;
   DllName     := PYTHON_KNOWN_VERSIONS[i].DllName;
   FAPIVersion := PYTHON_KNOWN_VERSIONS[i].APIVersion;
@@ -3556,14 +3555,6 @@ function  TPythonInterface.GetQuitMessage : string;
   Result := Format( 'Python could not be properly initialized. We must quit.', [DllName]);
 end;
 
-function TPythonInterface.GetInitialized: Boolean;
-begin
-  if Assigned(Py_IsInitialized) then
-    Result := Py_IsInitialized() <> 0
-  else
-    Result := FInitialized;
-end;
-
 procedure TPythonInterface.CheckPython;
 begin
   if not Initialized then
@@ -4589,7 +4580,6 @@ constructor TPythonEngine.Create(AOwner: TComponent);
 begin
   inherited;
   FLock                    := TCriticalSection.Create;
-  FInitialized             := False;
   FInitScript              := TstringList.Create;
   FClients                 := TList.Create;
   FRedirectIO              := True;
@@ -4660,6 +4650,7 @@ procedure TPythonEngine.Finalize;
         Py_Finalize;
       finally
         FFinalizing := False;
+        FInitialized := False;
       end;
     except 
     end;
@@ -4873,7 +4864,10 @@ procedure TPythonEngine.Initialize;
       Py_SetPythonHome(PAnsiChar(FPythonHome));
   end;
   Py_Initialize;
-  FInitialized := True;
+  if Assigned(Py_IsInitialized) then
+    FInitialized := Py_IsInitialized() <> 0
+  else
+    FInitialized := True;
   FIORedirected := False;
   InitSysPath;
   SetProgramArgs;

PythonForDelphi/Components/Sources/Core/VarPyth.pas

@@ -116,7 +116,7 @@ function iter(const AValue : Variant ) : Variant; // return an iterator for the
 implementation
 
 uses
-  VarUtils, SysUtils, SysConst, TypInfo, Classes;
+  VarUtils, SysUtils, TypInfo, Classes;
 
 type
   TNamedParamDesc = record
@@ -262,7 +262,6 @@   TPythonData = class(TObject)
 resourcestring
   SMultiDimensionalPropsNotSupported = 'Multi-dimensional sequences or mappings are not supported in Python';
   SCantConvertArg = 'Can''t convert argument #%d of %s into a Python object';
-  SBothOperandsOfIntDivideMustBeIntegers = 'Both operands of an integer division must be of type integer';
   SCantConvertKeyToPythonObject = 'Can''t convert Key into a Python object';
   SCantConvertValueToPythonObject = 'Can''t convert Value into a Python object';
   SCantCreateNewSequenceObject = 'Can''t create a new sequence object';
@@ -876,7 +875,6 @@ procedure TPythonVariantType.VarDataCastTo(var Dest: TVarData; const Source: TVa
 begin
   VarCast(Variant(Dest), Variant(Source), AVarType);
 end;
-
 {$ENDIF}
 
 procedure TPythonVariantType.Clear(var V: TVarData);