A few missing casts (Richard Neitzel).

guido · guido · commit fe23ff4d8459 · 1996-03-07T16:16:54.000Z
Don't append Unix paths on a Mac (Jack Jansen). git-svn-id: http://svn.python.org/projects/python/trunk@5912 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Tools/modulator/Templates/module_tail b/Tools/modulator/Templates/module_tail
@@ -3,7 +3,7 @@
 
 static struct PyMethodDef $abbrev$_methods[] = {
 	$methodlist$
-	{NULL,		NULL}		/* sentinel */
+	{NULL,	 (PyCFunction)NULL, 0, NULL}		/* sentinel */
 };
 
 
diff --git a/Tools/modulator/genmodule.py b/Tools/modulator/genmodule.py
@@ -81,8 +81,9 @@ def writecode(self, fp):
 	for fn in self.methodlist:
 	    self.method = fn
 	    self.addcode('module_method', fp)
-	    new_ml = new_ml + ('{"%s",\t%s_%s,\t1,\t%s_%s__doc__},\n'
-			       %(fn, self.abbrev, fn, self.abbrev, fn))
+	    new_ml = new_ml + (
+		      '{"%s",\t(PyCFunction)%s_%s,\tMETH_VARARGS,\t%s_%s__doc__},\n'
+		      %(fn, self.abbrev, fn, self.abbrev, fn))
 	self.methodlist = new_ml
 	self.addcode('module_tail', fp)
 
@@ -107,8 +108,9 @@ def writebody(self, fp):
 	for fn in self.methodlist:
 	    self.method = fn
 	    self.addcode('object_method', fp)
-	    new_ml = new_ml + ('{"%s",\t%s_%s,\t1,\t%s_%s__doc__},\n'
-			       %(fn, self.abbrev, fn, self.abbrev, fn))
+	    new_ml = new_ml + (
+		      '{"%s",\t(PyCFunction)%s_%s,\tMETH_VARARGS,\t%s_%s__doc__},\n'
+		      %(fn, self.abbrev, fn, self.abbrev, fn))
 	self.methodlist = new_ml
 	self.addcode('object_mlist', fp)
 
diff --git a/Tools/modulator/modulator.py b/Tools/modulator/modulator.py
@@ -17,7 +17,8 @@
 #
 
 import sys, os
-sys.path.append(os.path.join(os.environ['HOME'], 'src/python/Tools/modulator'))
+if os.name <> 'mac':
+	sys.path.append(os.path.join(os.environ['HOME'], 'src/python/Tools/modulator'))
 
 from Tkinter import *
 from Tkextra import *

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@`
`17`	`17`	`#`
`18`	`18`
`19`	`19`	`import sys, os`
`20`		`-sys.path.append(os.path.join(os.environ['HOME'], 'src/python/Tools/modulator'))`
	`20`	`+if os.name <> 'mac':`
	`21`	`+ sys.path.append(os.path.join(os.environ['HOME'], 'src/python/Tools/modulator'))`
`21`	`22`
`22`	`23`	`from Tkinter import *`
`23`	`24`	`from Tkextra import *`