Removed compilation warnings.

Author: pyscripter

PythonForDelphi/Components/Sources/Core/Definition.Inc

@@ -27,8 +27,8 @@
 /////////////////////////////////////////////////////////////////////////////
 
 //{$DEFINE PYTHON24}
-//{$DEFINE PYTHON25}
-{$DEFINE PYTHON26`}
+{$DEFINE PYTHON25}
+//{$DEFINE PYTHON26}
 //{$DEFINE PYTHON27}
 //{$DEFINE PYTHON30}
 //{$DEFINE PYTHON31}

PythonForDelphi/Components/Sources/Core/PythonEngine.pas

@@ -6076,8 +6076,6 @@ function TPythonEngine.PyObjectAsVariant( obj : PPyObject ) : Variant;
 end;
 
 function TPythonEngine.VarRecAsPyObject( v : TVarRec ) : PPyObject;
-var
-  buff : array [0..256] of AnsiChar;
 begin
   case v.VType of
     vtInteger:       Result := PyInt_FromLong( v.VInteger );
@@ -6087,7 +6085,7 @@ function TPythonEngine.VarRecAsPyObject( v : TVarRec ) : PPyObject;
     vtString:
     begin
       if Assigned(v.VString) then
-        Result := PyString_FromString( StrPCopy( buff, v.VString^) )
+        Result := PyString_FromString(PAnsiChar(AnsiString(v.VString^)))
       else
         Result := PyString_FromString( '' );
     end;
@@ -6213,7 +6211,7 @@ function TPythonEngine.ArrayToPyDict( items : array of const) : PPyObject;
       vtAnsiString:
         begin
           if Assigned(v.VAnsiString) then
-            Result := StrPas(PAnsiChar(Ansistring(v.VAnsiString)))
+            Result := Ansistring(v.VAnsiString)
           else
             Result := '';
         end;

PythonForDelphi/Components/Sources/Core/PythonVersions.pas

@@ -20,12 +20,14 @@   TPythonVersion = record
   private
     FDisplayName: string;
     FHelpFile: string;
+    fSysArchitecture : string;
     function GetDLLName: string;
-    function GetSysArchitecture:string;
+    function ExpectedArchitecture:string;
     function GetIsPython3K: Boolean;
     function GetHelpFile: string;
     function GetDisplayName: string;
     function GetApiVersion: integer;
+    function GetSysArchitecture: string;
   public
     IsRegistered: Boolean;
     IsAllUsers: Boolean;
@@ -55,12 +57,12 @@   TPythonVersion = record
 
   {$IFDEF MSWINDOWS}
   (* Checks whether a Python version is registered and returns the related info *)
-  function GetRegisterPythonVersion(SysVersion: string;
+  function GetRegisteredPythonVersion(SysVersion: string;
     out PythonVersion: TPythonVersion): Boolean;
   (* Returns all registered Python versions *)
   function GetRegisteredPythonVersions : TPythonVersions;
   (* Returns the highest numbered registered Python version *)
-  function GetLatestRegisteredPythonVersion(PythonVersion: TPythonVersion): Boolean;
+  function GetLatestRegisteredPythonVersion(out PythonVersion: TPythonVersion): Boolean;
   {$ENDIF}
 
 implementation
@@ -85,7 +87,7 @@ function TPythonVersion.GetDLLName: string;
   {$ENDIF}
 end;
 
-function TPythonVersion.GetSysArchitecture: string;
+function TPythonVersion.ExpectedArchitecture: string;
 begin
   Result := '';
   {$IFDEF CPUX64}
@@ -154,6 +156,13 @@ function TPythonVersion.GetIsPython3K: Boolean;
   end;
 end;
 
+function TPythonVersion.GetSysArchitecture: string;
+begin
+  Result := fSysArchitecture;
+  if Result = '' then
+    Result := 'Unknown';
+end;
+
 function  CompareVersions(A, B : String) : Integer;
 
   function GetNextNumber(var Version: string): Integer;
@@ -197,7 +206,7 @@ function  CompareVersions(A, B : String) : Integer;
 end;
 
 {$IFDEF MSWINDOWS}
-function GetRegisterPythonVersion(SysVersion: string;
+function GetRegisteredPythonVersion(SysVersion: string;
   out PythonVersion: TPythonVersion): Boolean;
   // Python provides for All user and Current user installations
   // All User installations place the Python DLL in the Windows System directory
@@ -233,6 +242,7 @@ function GetRegisterPythonVersion(SysVersion: string;
           if OpenKey(Key, False) then begin
             PythonVersion.DisplayName := ReadString('DisplayName');
             PythonVersion.Version := ReadString('Version');
+            PythonVersion.fSysArchitecture :=  ReadString('SysArchitecture');
             CloseKey;
           end;
           if OpenKey(Key + '\PythonPath', False) then begin
@@ -260,10 +270,10 @@ function GetRegisterPythonVersion(SysVersion: string;
   FillChar(PythonVersion, SizeOf(TPythonVersion), 0);
 
   VersionSuffix := '';
-{$IFDEF CPUX86}
+  {$IFDEF CPUX86}
   if CompareVersions(SysVersion, '3.5') <= 0 then
     VersionSuffix := '-32';
-{$ENDIF}
+  {$ENDIF}
   key := Format('\Software\Python\PythonCore\%s%s', [SysVersion, VersionSuffix]);
 
 
@@ -276,6 +286,10 @@ function GetRegisterPythonVersion(SysVersion: string;
   if not Result then begin
     PythonVersion.IsAllUsers := True;
     Result := ReadFromRegistry(HKEY_LOCAL_MACHINE, key);
+    if PythonVersion.fSysArchitecture = '' then
+      // for all user installations we can be sure.
+      /// But not for local user installations
+      PythonVersion.fSysArchitecture := PythonVersion.ExpectedArchitecture;
   end;
 
   PythonVersion.IsRegistered := Result;
@@ -290,22 +304,21 @@ function GetRegisteredPythonVersions : TPythonVersions;
   Count := 0;
   SetLength(Result, High(PYTHON_KNOWN_VERSIONS) - COMPILED_FOR_PYTHON_VERSION_INDEX + 1);
   for I := High(PYTHON_KNOWN_VERSIONS) downto COMPILED_FOR_PYTHON_VERSION_INDEX do
-    if GetRegisterPythonVersion(PYTHON_KNOWN_VERSIONS[I].RegVersion, PythonVersion) then
+    if GetRegisteredPythonVersion(PYTHON_KNOWN_VERSIONS[I].RegVersion, PythonVersion) then
     begin
       Result[Count] := PythonVersion;
       Inc(Count);
     end;
   SetLength(Result, Count);
 end;
 
-function GetLatestRegisteredPythonVersion(PythonVersion: TPythonVersion): Boolean;
+function GetLatestRegisteredPythonVersion(out PythonVersion: TPythonVersion): Boolean;
 Var
   I: Integer;
 begin
-  Result := False;
   for I := High(PYTHON_KNOWN_VERSIONS) downto COMPILED_FOR_PYTHON_VERSION_INDEX do
   begin
-    Result := GetRegisterPythonVersion(PYTHON_KNOWN_VERSIONS[I].RegVersion, PythonVersion);
+    Result := GetRegisteredPythonVersion(PYTHON_KNOWN_VERSIONS[I].RegVersion, PythonVersion);
     if Result then break;
   end;
 end;

PythonForDelphi/Components/Sources/Core/VarPyth.pas

@@ -968,7 +968,7 @@     TStringDesc = record
   begin
     // Grab the identifier
     LArgCount := CallDesc^.ArgCount;
-    LIdent := FixupIdent(AnsiString(PAnsiChar(@CallDesc^.ArgTypes[LArgCount])));
+    LIdent := FixupIdent(string(AnsiString(PAnsiChar(@CallDesc^.ArgTypes[LArgCount]))));
 
     FillChar(Strings, SizeOf(Strings), 0);
     VarParams := GetDispatchInvokeArgs(CallDesc, Params, Strings, true);
@@ -1052,7 +1052,7 @@     TStringDesc = record
     SetLength(fNamedParams, CallDesc^.NamedArgCount);
     // Skip function Name
     for I := 0 to CallDesc^.NamedArgCount - 1 do begin
-      LNamePtr := LNamePtr + Succ(StrLen(LNamePtr));
+      LNamePtr := LNamePtr + Succ(Length(LNamePtr));
       fNamedParams[I].Index := I+LNamedArgStart;
       fNamedParams[I].Name  := AnsiString(LNamePtr);
     end;
@@ -1427,7 +1427,6 @@ function TPythonVariantType.EvalPython(const V: TVarData;
     _key, _value : PPyObject;
     _result : Integer;
   begin
-    Result := nil;
     with GetPythonEngine do
     begin
       PyErr_Clear;
@@ -1438,21 +1437,21 @@ function TPythonVariantType.EvalPython(const V: TVarData;
         _value := VarDataToPythonObject(AValue);
         if not Assigned(_value) then
           raise Exception.Create(SCantConvertValueToPythonObject);
-          if PyList_Check(AObject) then
-            _result := PyList_SetItem( AObject, Variant(AKey), _value )
-          else if PyTuple_Check(AObject) then
-            _result := PyTuple_SetItem( AObject, Variant(AKey), _value )
-          else
-            try
-              if PySequence_Check(AObject) <> 0 then
-                _result := PySequence_SetItem(AObject, Variant(AKey), _value)
-              else
-                _result := PyObject_SetItem( AObject, _key, _value );
-            finally
-              Py_XDecRef(_value);
-            end; // of try
-          CheckError;
-          Result := PyInt_FromLong(_result);
+        if PyList_Check(AObject) then
+          _result := PyList_SetItem( AObject, Variant(AKey), _value )
+        else if PyTuple_Check(AObject) then
+          _result := PyTuple_SetItem( AObject, Variant(AKey), _value )
+        else
+          try
+            if PySequence_Check(AObject) <> 0 then
+              _result := PySequence_SetItem(AObject, Variant(AKey), _value)
+            else
+              _result := PyObject_SetItem( AObject, _key, _value );
+          finally
+            Py_XDecRef(_value);
+          end; // of try
+        CheckError;
+        Result := PyInt_FromLong(_result);
       finally
         Py_XDecRef(_key);
       end; // of try