Author: benjamin.peterson Date: Fri Mar 26 00:30:20 2010 New Revision: 79429 Log: 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 ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Python/import.c Modified: python/branches/py3k/Python/import.c ============================================================================== --- python/branches/py3k/Python/import.c (original) +++ python/branches/py3k/Python/import.c Fri Mar 26 00:30:20 2010 @@ -661,7 +661,7 @@ /* 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 @@ return m; error: - _RemoveModule(name); + remove_module(name); return NULL; }