__findattr__ refactor

src/org/python/core/PyClass.java

 // Copyright (c) Corporation for National Research Initiatives
 package org.python.core;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * A python class.
  */
@@ skipping 210 matching lines @@
 
     public PyObject fastGetDict() {
         return __dict__;
     }
 
     PyObject lookup(String name, boolean stop_at_java) {
         PyObject[] result = lookupGivingClass(name, stop_at_java);
         return result[0];
     }
 
-    public PyObject __findattr__(String name) {
+    public PyObject __findattr_ex__(String name) {
         if (name == "__dict__") {
             return __dict__;
         }
         if (name == "__name__") {
             return new PyString(__name__);
         }
         if (name == "__bases__") {
             return __bases__;
         }
         if (name == "__class__") {
             return null;
         }
 
         PyObject[] result = lookupGivingClass(name, false);
 
         if (result[0] == null) {
-            return super.__findattr__(name);
+            return super.__findattr_ex__(name);
         }
         // xxx do we need to use result[1] (wherefound) for java cases for backw
         // comp?
         return result[0].__get__(null, this);
     }
 
     public void __setattr__(String name, PyObject value) {
         if (name == "__dict__") {
             if (!value.isMappingType())
                 throw Py.TypeError("__dict__ must be a dictionary object");
@@ skipping 102 matching lines @@
         int n = bases.length;
         for (int i = 0; i < n; i++) {
             PyClass c = (PyClass) bases[i];
             if (c.isSubClass(superclass)) {
                 return true;
             }
         }
         return false;
     }
 }