Prepare collections module for pure python code entries.

diff --git a/Lib/collections.py b/Lib/collections.py
new file mode 100644 (file)
index 0000000..0d9254c
--- /dev/null
+++ b/Lib/collections.py
@@ -0,0 +1,3 @@
+__all__ = ['deque', 'defaultdict']
+
+from _collections import deque, defaultdict

diff --git a/Modules/collectionsmodule.c b/Modules/_collectionsmodule.c
similarity index 99%
rename from Modules/collectionsmodule.c
rename to Modules/_collectionsmodule.c
index f98bd490323dcd2db35f44ee1f1cb51ae052ffe9..c37f9ace157479bcd55358deff06eb0fa378bcdd 100644 (file)
--- a/Modules/collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -1337,11 +1337,11 @@ PyDoc_STRVAR(module_doc,
 ");
 
 PyMODINIT_FUNC
-initcollections(void)
+init_collections(void)
 {
        PyObject *m;
 
-       m = Py_InitModule3("collections", NULL, module_doc);
+       m = Py_InitModule3("_collections", NULL, module_doc);
        if (m == NULL)
                return;
 

diff --git a/PC/config.c b/PC/config.c
index a9a280ded1058dd058dbba268199ffdfc880fb4f..e1b52a4f232b63b5c8751309ad0be624af7c7761 100644 (file)
--- a/PC/config.c
+++ b/PC/config.c
@@ -43,7 +43,7 @@ extern void initxxsubtype(void);
 extern void initzipimport(void);
 extern void init_random(void);
 extern void inititertools(void);
-extern void initcollections(void);
+extern void init_collections(void);
 extern void init_heapq(void);
 extern void init_bisect(void);
 extern void init_symtable(void);
@@ -124,7 +124,7 @@ struct _inittab _PyImport_Inittab[] = {
         {"_heapq", init_heapq},
        {"_lsprof", init_lsprof},
        {"itertools", inititertools},
-        {"collections", initcollections},
+        {"_collections", init_collections},
        {"_symtable", init_symtable},
        {"mmap", initmmap},
        {"_csv", init_csv},

diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index 9f59cf42e3eb61b29e05889ea179d5ad5eccdc7d..50e51f7aeed4167060ec067860f2907fc56f7d00 100644 (file)
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -458,7 +458,7 @@
                        RelativePath="..\Objects\codeobject.c">
                </File>
                <File
-                       RelativePath="..\Modules\collectionsmodule.c">
+                       RelativePath="..\Modules\_collectionsmodule.c">
                </File>
                <File
                        RelativePath="..\Python\compile.c">

diff --git a/PCbuild8/pythoncore.vcproj b/PCbuild8/pythoncore.vcproj
index f3358792fb6df01dac74f83ea8e526b908eb2fa3..16a250e5fce06522a0d3b8d983d4ee66469e17cf 100644 (file)
--- a/PCbuild8/pythoncore.vcproj
+++ b/PCbuild8/pythoncore.vcproj
@@ -1381,7 +1381,7 @@
                        >
                </File>
                <File
-                       RelativePath="..\Modules\collectionsmodule.c"
+                       RelativePath="..\Modules\_collectionsmodule.c"
                        >
                </File>
                <File

diff --git a/setup.py b/setup.py
index 32ea77aeed204307851fc6084923a2b8fbcd5bfb..98d0e97521487310218ae89c62fee8928b55a1ba 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -370,7 +370,7 @@ class PyBuildExt(build_ext):
         # fast iterator tools implemented in C
         exts.append( Extension("itertools", ["itertoolsmodule.c"]) )
         # high-performance collections
-        exts.append( Extension("collections", ["collectionsmodule.c"]) )
+        exts.append( Extension("_collections", ["_collectionsmodule.c"]) )
         # bisect
         exts.append( Extension("_bisect", ["_bisectmodule.c"]) )
         # heapq