__findattr__ refactor

src/org/python/core/PyFrame.java

 // Copyright (c) Corporation for National Research Initiatives
 package org.python.core;
 
 /**
  * A Python frame object.
  */
 public class PyFrame extends PyObject
 {
     public PyFrame f_back;
 
@@ skipping 150 matching lines @@
             tracefunc = null;
         } else {
             throwReadonly(name);
         }
         // not yet implemented:
         // f_exc_type
         // f_exc_value
         // f_exc_traceback
     }
 
-    public PyObject __findattr__(String name) {
+    public PyObject __findattr_ex__(String name) {
         if (name == "f_locals") {
             return getLocals();
         } else if (name == "f_trace") {
             if (tracefunc instanceof PythonTraceFunction) {
                 return ((PythonTraceFunction)tracefunc).tracefunc;
             }
             return Py.None;
         }
-        return super.__findattr__(name);
+        return super.__findattr_ex__(name);
     }
 
     /**
      * Return the locals dict. First merges the fast locals into
      * f_locals, then returns the updated f_locals.
      *
      * @return a PyObject mapping of locals
      */
     public PyObject getLocals() {
         if (f_locals == null) {
@@ skipping 191 matching lines @@
     }
 
     public void setderef(int index, PyObject value) {
         f_env[index].ob_ref = value;
     }
 
     public void to_cell(int parm_index, int env_index) {
         f_env[env_index].ob_ref = f_fastlocals[parm_index];
     }
 }