pyscripter#52 Py_FindMethod not available in Python 3.x

pyscripter · pyscripter · commit da1179cd5bb5 · 2018-08-21T17:18:16.000+03:00
diff --git a/PythonForDelphi/Components/Sources/Core/PythonEngine.pas b/PythonForDelphi/Components/Sources/Core/PythonEngine.pas
@@ -7800,15 +7800,6 @@ function  TPyObject.GetAttr(key : PAnsiChar) : PPyObject;
       finally
         Py_XDecRef(PyKey);
       end;
-
-//      // check for a method
-//      if IsPython3000 then
-//        // I think Python 3000 from beta 2 gets the methods from the tp_methods field
-//        Result := nil
-//      else
-//        Result := Py_FindMethod( PythonType.MethodsData, GetSelf, key);
-//      if not Assigned(Result) then
-//        PyErr_SetString (PyExc_AttributeError^, PAnsiChar(Format('Unknown attribute "%s"',[key])));
     end;
 end;
 
diff --git a/PythonForDelphi/Demos/Demo06/Unit1.pas b/PythonForDelphi/Demos/Demo06/Unit1.pas
@@ -170,9 +170,7 @@ function  PyPoint_getattr(obj : PPyObject; key : PAnsiChar) : PPyObject; cdecl;
       else
         begin
           // Else check for a method
-          Result := Py_FindMethod( MethodsByName('PythonType1'), obj, key);
-          // or we could write, because it's quicker:
-          // Result := Py_FindMethod( Form1.PythonType1.MethodsData, obj, key);
+          Result := PyObject_GenericGetAttr(obj, PyString_FromString(key));
           if not Assigned(Result) then
             PyErr_SetString (PyExc_AttributeError^, PAnsiChar(Format('Unknown attribute "%s"',[key])));
         end;
diff --git a/PythonForDelphi/Demos/Demo07/Unit1.pas b/PythonForDelphi/Demos/Demo07/Unit1.pas
@@ -208,9 +208,7 @@ function  PyPoint_getattr(obj : PPyObject; key : PAnsiChar) : PPyObject; cdecl;
       else
         begin
           // Else check for a method
-          Result := Py_FindMethod( MethodsByName('PythonType1'), obj, key);
-          // or we could write, because it's quicker:
-          // Result := Py_FindMethod( Form1.PythonType1.MethodsData, obj, key);
+          Result := PyObject_GenericGetAttr(obj, PyString_FromString(key));
           if not Assigned(Result) then
             PyErr_SetString (PyExc_AttributeError^, PAnsiChar(Format('Unknown attribute "%s"',[key])));
         end;
diff --git a/PythonForDelphi/Demos/FPC/Demo06/Unit1.pas b/PythonForDelphi/Demos/FPC/Demo06/Unit1.pas
@@ -173,9 +173,7 @@ function  PyPoint_getattr(obj : PPyObject; key : PAnsiChar) : PPyObject; cdecl;
       else
         begin
           // Else check for a method
-          Result := Py_FindMethod( MethodsByName('PythonType1'), obj, key);
-          // or we could write, because it's quicker:
-          // Result := Py_FindMethod( Form1.PythonType1.MethodsData, obj, key);
+          Result := PyObject_GenericGetAttr(obj, PyString_FromString(key));
           if not Assigned(Result) then
             PyErr_SetString (PyExc_AttributeError^, PAnsiChar(Format('Unknown attribute "%s"',[key])));
         end;
