Merged revisions 79428 via svnmerge from

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
........

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;
 }