Index: Source/Modules/python.cxx
===================================================================
RCS file: /cvsroot/SWIG/Source/Modules/python.cxx,v
-retrieving revision 1.39
-diff -u -4 -r1.39 python.cxx
---- Source/Modules/python.cxx 22 Jan 2004 22:42:17 -0000 1.39
-+++ Source/Modules/python.cxx 22 Jan 2004 22:51:35 -0000
+retrieving revision 1.40
+diff -u -4 -r1.40 python.cxx
+--- Source/Modules/python.cxx 24 Jan 2004 00:25:31 -0000 1.40
++++ Source/Modules/python.cxx 30 Jan 2004 22:22:16 -0000
@@ -50,8 +50,17 @@
static int have_constructor;
static int have_repr;
}
-@@ -441,8 +456,256 @@
+@@ -441,8 +456,248 @@
}
+ have_auto = (autodoc != NULL && Len(autodoc) > 0);
+ }
+
-+// if ( have_auto && have_ds )
-+// doc = NewStringf("%s%s\n\n%s%s", triple_double, autodoc, str, triple_double);
-+// else if ( !have_auto && have_ds )
-+// doc = NewStringf("%s%s%s", triple_double, str, triple_double);
-+// else
-+// doc = NewStringf("%s%s%s", triple_double, autodoc, triple_double);
-+
-+
+ // If there is more than one line then make docstrings like this:
+ //
+ // """
+ break;
+
+ case AUTODOC_STATICFUNC:
-+ Printf(doc, "%s.%s(%s)", class_name, symname, make_autodocParmList(n, showTypes));
++ Printf(doc, "%s(%s)", symname, make_autodocParmList(n, showTypes));
+ if (type) Printf(doc, " -> %s", type);
+ break;
+
* Check if there is a %addtofunc directive and it has text
* ------------------------------------------------------------ */
-@@ -1698,9 +1961,11 @@
+@@ -1731,9 +1986,11 @@
Printf(f_shadow, modern ? "(object)" : "(_object)");
}
}
Printv(f_shadow,tab4,"__swig_setmethods__ = {}\n",NIL);
if (Len(base_class)) {
Printf(f_shadow,"%sfor _s in [%s]: __swig_setmethods__.update(_s.__swig_setmethods__)\n",tab4,base_class);
-@@ -1833,16 +2098,22 @@
+@@ -1866,16 +2123,22 @@
Delete(pyaction);
Printv(f_shadow,pycode,"\n",NIL);
} else {
}
}
-@@ -1857,14 +2128,20 @@
+@@ -1890,14 +2153,20 @@
virtual int staticmemberfunctionHandler(Node *n) {
String *symname = Getattr(n,"sym:name");
Language::staticmemberfunctionHandler(n);
" = staticmethod(", symname, ")\n", NIL);
if (!modern) {
-@@ -1949,8 +2226,10 @@
+@@ -1982,8 +2251,10 @@
}
Printv(f_shadow, tab4, "def __init__(self, *args",
if (!modern) {
Printv(f_shadow, tab8, "_swig_setattr(self, ", rclassname, ", 'this', ",
funcCallHelper(Swig_name_construct(symname), allow_kwargs), ")\n", NIL);
-@@ -1964,9 +2243,9 @@
+@@ -1997,9 +2268,9 @@
Printv(f_shadow, tab8, "self.thisown = 1\n", NIL);
Printv(f_shadow, tab8, "del newobj.thisown\n", NIL);
}
}
have_constructor = 1;
} else {
-@@ -1982,8 +2261,10 @@
+@@ -2015,8 +2286,10 @@
} else {
Printv(f_shadow_stubs, "\ndef ", symname, "(*args",
funcCallHelper(Swig_name_construct(symname), allow_kwargs), "\n", NIL);
Printv(f_shadow_stubs, tab4, "val.thisown = 1\n", NIL);
if ( have_addtofunc(n) )
-@@ -2015,13 +2296,15 @@
+@@ -2048,13 +2321,15 @@
Delete(pyaction);
Printv(f_shadow,pycode,"\n", NIL);
} else {