add __get__ to PyBuiltinMethodSet so it functions properly as a descriptor

groves · groves · commit 0131038fb960 · 2007-05-30T05:19:19.000Z
diff --git a/src/com/ziclix/python/sql/PyConnection.java b/src/com/ziclix/python/sql/PyConnection.java
@@ -461,7 +461,7 @@ boolean contains(PyStatement statement) {
 
 class ConnectionFunc extends PyBuiltinMethodSet {
     ConnectionFunc(String name, int index, int minargs, int maxargs, String doc) {
-        super(name, index, minargs, maxargs, doc);
+        super(name, index, minargs, maxargs, doc, PyConnection.class);
     }
 
     public PyObject __call__() {
diff --git a/src/com/ziclix/python/sql/PyCursor.java b/src/com/ziclix/python/sql/PyCursor.java
@@ -875,10 +875,10 @@ public static boolean isSeqSeq(PyObject object) {
 
 class CursorFunc extends PyBuiltinMethodSet {
   CursorFunc(String name, int index, int argcount, String doc) {
-    super(name, index, argcount, argcount, doc);
+    this(name, index, argcount, argcount, doc);
   }
   CursorFunc(String name, int index, int minargs, int maxargs, String doc) {
-    super(name, index, minargs, maxargs, doc);
+    super(name, index, minargs, maxargs, doc, PyCursor.class);
   }
 
   public PyObject __call__() {
diff --git a/src/com/ziclix/python/sql/PyExtendedCursor.java b/src/com/ziclix/python/sql/PyExtendedCursor.java
@@ -489,11 +489,11 @@ protected String getMetaDataName(PyObject name) {
 class ExtendedCursorFunc extends PyBuiltinMethodSet {
 
     ExtendedCursorFunc(String name, int index, int argcount, String doc) {
-        super(name, index, argcount, argcount, doc);
+        this(name, index, argcount, argcount, doc);
     }
 
     ExtendedCursorFunc(String name, int index, int minargs, int maxargs, String doc) {
-        super(name, index, minargs, maxargs, doc);
+        super(name, index, minargs, maxargs, doc, PyExtendedCursor.class);
     }
 
     public PyObject __call__() {
diff --git a/src/com/ziclix/python/sql/util/BCP.java b/src/com/ziclix/python/sql/util/BCP.java
@@ -212,11 +212,11 @@ protected PyObject bcp(String fromTable, String where, PyObject params, PyObject
 class BCPFunc extends PyBuiltinMethodSet {
 
     BCPFunc(String name, int index, int argcount, String doc) {
-        super(name, index, argcount, argcount, doc);
+        this(name, index, argcount, argcount, doc);
     }
 
     BCPFunc(String name, int index, int minargs, int maxargs, String doc) {
-        super(name, index, minargs, maxargs, doc);
+        super(name, index, minargs, maxargs, doc, BCP.class);
     }
 
     /**
diff --git a/src/org/python/core/PyBuiltinMethodSet.java b/src/org/python/core/PyBuiltinMethodSet.java
@@ -7,8 +7,22 @@ public PyBuiltinMethodSet(String name,
                               int index,
                               int minargs,
                               int maxargs,
-                              String doc) {
+                              String doc,
+                              Class type) {
         super(name, index, minargs, maxargs, doc);
+        this.type = type;
+    }
+
+    public PyObject __get__(PyObject obj, PyObject type) {
+        if(obj != null) {
+            if(this.type.isAssignableFrom(obj.getClass())) {
+                return bind(obj);
+            } else {
+                throw Py.TypeError("descriptor '" + info.getName() + "' for '" + PyType.fromClass(this.type)
+                        + "' objects doesn't apply to '" + obj.getType() + "' object");
+            }
+        }
+        return this;
     }
 
     public PyBuiltinFunction bind(PyObject bindTo) {
@@ -34,5 +48,7 @@ public String toString(){
         return "<built-in method "+info.getName()+">";
     }
 
+    private Class type;
+    
     protected PyObject __self__ = Py.None;
 }

Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ boolean contains(PyStatement statement) {`
`461`	`461`
`462`	`462`	`class ConnectionFunc extends PyBuiltinMethodSet {`
`463`	`463`	`ConnectionFunc(String name, int index, int minargs, int maxargs, String doc) {`
`464`		`- super(name, index, minargs, maxargs, doc);`
	`464`	`+ super(name, index, minargs, maxargs, doc, PyConnection.class);`
`465`	`465`	`}`
`466`	`466`
`467`	`467`	`public PyObject __call__() {`
Original file line number	Diff line number	Diff line change
`@@ -875,10 +875,10 @@ public static boolean isSeqSeq(PyObject object) {`
`875`	`875`
`876`	`876`	`class CursorFunc extends PyBuiltinMethodSet {`
`877`	`877`	`CursorFunc(String name, int index, int argcount, String doc) {`
`878`		`- super(name, index, argcount, argcount, doc);`
	`878`	`+ this(name, index, argcount, argcount, doc);`
`879`	`879`	`}`
`880`	`880`	`CursorFunc(String name, int index, int minargs, int maxargs, String doc) {`
`881`		`- super(name, index, minargs, maxargs, doc);`
	`881`	`+ super(name, index, minargs, maxargs, doc, PyCursor.class);`
`882`	`882`	`}`
`883`	`883`
`884`	`884`	`public PyObject __call__() {`
Original file line number	Diff line number	Diff line change
`@@ -489,11 +489,11 @@ protected String getMetaDataName(PyObject name) {`
`489`	`489`	`class ExtendedCursorFunc extends PyBuiltinMethodSet {`
`490`	`490`
`491`	`491`	`ExtendedCursorFunc(String name, int index, int argcount, String doc) {`
`492`		`- super(name, index, argcount, argcount, doc);`
	`492`	`+ this(name, index, argcount, argcount, doc);`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`ExtendedCursorFunc(String name, int index, int minargs, int maxargs, String doc) {`
`496`		`- super(name, index, minargs, maxargs, doc);`
	`496`	`+ super(name, index, minargs, maxargs, doc, PyExtendedCursor.class);`
`497`	`497`	`}`
`498`	`498`
`499`	`499`	`public PyObject __call__() {`
Original file line number	Diff line number	Diff line change
`@@ -212,11 +212,11 @@ protected PyObject bcp(String fromTable, String where, PyObject params, PyObject`
`212`	`212`	`class BCPFunc extends PyBuiltinMethodSet {`
`213`	`213`
`214`	`214`	`BCPFunc(String name, int index, int argcount, String doc) {`
`215`		`- super(name, index, argcount, argcount, doc);`
	`215`	`+ this(name, index, argcount, argcount, doc);`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`BCPFunc(String name, int index, int minargs, int maxargs, String doc) {`
`219`		`- super(name, index, minargs, maxargs, doc);`
	`219`	`+ super(name, index, minargs, maxargs, doc, BCP.class);`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`/**`