__findattr__ refactor

src/org/python/core/PyArrayDerived.java

 /* Generated file, do not modify.  See jython/src/templates/gderived.py. */
 package org.python.core;
 
 public class PyArrayDerived extends PyArray implements Slotted {
 
     public PyObject getSlot(int index) {
         return slots[index];
     }
 
     public void setSlot(int index,PyObject value) {
@@ skipping 956 matching lines @@
             if (impl!=null)
                 return impl.__get__(this,self_type).__call__(args,keywords);
             return super.__call__(args,keywords);
         } finally {
             --ts.recursion_depth;
         }
     }
 
     public PyObject __findattr_ex__(String name) {
         PyType self_type=getType();
+        // TODO: We should speed this up. As the __getattribute__ slot almost never
+        //       changes, it is a good candidate for caching, as PyClass does with
+        //       __getattr__. See #1102.
         PyObject getattribute=self_type.lookup("__getattribute__");
         PyString py_name=null;
         PyException firstAttributeError=null;
         try {
             if (getattribute!=null) {
-                return getattribute.__get__(this,self_type).__call__(py_name=PyString.fromInterned(name));
+                py_name=PyString.fromInterned(name);
+                return getattribute.__get__(this,self_type).__call__(py_name);
             } else {
-                // XXX: This shouldn't happen, becase PyObject exposes
-                //      __getattribute__. 
-                //
-                //      And, by the way, invoking object__getattribute__ is the 
-                //      common case. We should optimize that to avoid doing the
-                //      '__getattribute__' lookup each time. 
+                Py.Warning(String.format("__getattribute__ not found on type %s",self_type.getName()));
                 PyObject ret=super.__findattr_ex__(name);
                 if (ret!=null) {
                     return ret;
                 } // else: pass through to __getitem__ invocation
             }
         } catch (PyException e) {
             if (!Py.matchException(e,Py.AttributeError)) {
                 throw e;
             } else {
                 firstAttributeError=e; // saved to avoid swallowing custom AttributeErrors
             // and pass through to __getattr__ invocation.
             }
         }
         PyObject getattr=self_type.lookup("__getattr__");
         if (getattr!=null) {
-            return getattr.__get__(this,self_type).__call__(py_name!=null?py_name:PyString.fromInterned(name));
+            if (py_name==null) {
+                py_name=PyString.fromInterned(name);
+            }
+            return getattr.__get__(this,self_type).__call__(py_name);
         }
         if (firstAttributeError!=null) {
             throw firstAttributeError;
-        } else {
-            return null;
-        }
+        }
+        return null;
     }
 
     public void __setattr__(String name,PyObject value) {
         PyType self_type=getType();
         PyObject impl=self_type.lookup("__setattr__");
         if (impl!=null) {
             impl.__get__(this,self_type).__call__(PyString.fromInterned(name),value);
             return;
         }
         super.__setattr__(name,value);
@@ skipping 100 matching lines @@
         if (impl!=null)
             return impl.__get__(this,self_type).__call__(Py.java2py(c)).__tojava__(Object.class);
         return super.__tojava__(c);
     }
 
     public Object __coerce_ex__(PyObject o) {
         PyType self_type=getType();
         PyObject impl=self_type.lookup("__coerce__");
         if (impl!=null) {
             PyObject res=impl.__get__(this,self_type).__call__(o);
-            if (res==null||res==Py.None)
-                return res;
+            if (res==Py.NotImplemented)
+                return Py.None;
             if (!(res instanceof PyTuple))
-                throw Py.TypeError("coercion should return None or 2-tuple");
+                throw Py.TypeError("__coerce__ didn't return a 2-tuple");
             return((PyTuple)res).getArray();
         }
         return super.__coerce_ex__(o);
     }
 
     public String toString() {
         PyType self_type=getType();
         PyObject impl=self_type.lookup("__repr__");
         if (impl!=null) {
             PyObject res=impl.__get__(this,self_type).__call__();
             if (!(res instanceof PyString))
                 throw Py.TypeError("__repr__ returned non-string (type "+res.getType().fastGetName()+")");
             return((PyString)res).toString();
         }
         return super.toString();
     }
 
 }