* Restore the pure python version of heapq.py.

* Mark the C version as private and only use when available.

PC/config.c

@@ -47,7 +47,7 @@ extern void initzipimport(void);
 extern void init_random(void);
 extern void inititertools(void);
 extern void initcollections(void);
-extern void initheapq(void);
+extern void init_heapq(void);
 extern void init_bisect(void);
 extern void init_symtable(void);
 extern void initmmap(void);
@@ -135,7 +135,7 @@ struct _inittab _PyImport_Inittab[] = {
 	{"_hotshot", init_hotshot},
 	{"_random", init_random},
         {"_bisect", init_bisect},
-        {"heapq", initheapq},
+        {"_heapq", init_heapq},
 	{"itertools", inititertools},
         {"collections", initcollections},
 	{"_symtable", init_symtable},

setup.py

@@ -327,7 +327,7 @@ class PyBuildExt(build_ext):
         # bisect
         exts.append( Extension("_bisect", ["_bisectmodule.c"]) )
         # heapq
-        exts.append( Extension("heapq", ["heapqmodule.c"]) )
+        exts.append( Extension("_heapq", ["_heapqmodule.c"]) )
         # operator.add() and similar goodies
         exts.append( Extension('operator', ['operator.c']) )
         # Python C API test module