Merged revisions 79428 via svnmerge from

benjaminp · benjaminp · commit fa0aebacd9f5 · 2010-03-25T23:30:20.000Z
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79428 | benjamin.peterson | 2010-03-25 18:27:16 -0500 (Thu, 25 Mar 2010) | 1 line

  make naming convention consistent
........
diff --git a/Python/import.c b/Python/import.c
@@ -661,7 +661,7 @@ PyImport_AddModule(const char *name)
 
 /* Remove name from sys.modules, if it's there. */
 static void
-_RemoveModule(const char *name)
+remove_module(const char *name)
 {
 	PyObject *modules = PyImport_GetModuleDict();
 	if (PyDict_GetItemString(modules, name) == NULL)
@@ -735,7 +735,7 @@ PyImport_ExecCodeModuleEx(char *name, PyObject *co, char *pathname)
 	return m;
 
   error:
-	_RemoveModule(name);
+	remove_module(name);
 	return NULL;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -661,7 +661,7 @@ PyImport_AddModule(const char *name)`
`661`	`661`
`662`	`662`	`/* Remove name from sys.modules, if it's there. */`
`663`	`663`	`static void`
`664`		`-_RemoveModule(const char *name)`
	`664`	`+remove_module(const char *name)`
`665`	`665`	`{`
`666`	`666`	`PyObject *modules = PyImport_GetModuleDict();`
`667`	`667`	`if (PyDict_GetItemString(modules, name) == NULL)`
`@@ -735,7 +735,7 @@ PyImport_ExecCodeModuleEx(char name, PyObject co, char *pathname)`
`735`	`735`	`return m;`
`736`	`736`
`737`	`737`	`error:`
`738`		`- _RemoveModule(name);`
	`738`	`+ remove_module(name);`
`739`	`739`	`return NULL;`
`740`	`740`	`}`
`741`	`741`