#2879: rename _winreg to winreg.
diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 9a369f2..84a5bb5 100644
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -177,7 +177,7 @@
# End Source File
# Begin Source File
-SOURCE=..\_winreg.c
+SOURCE=..\winreg.c
# End Source File
# Begin Source File
diff --git a/PC/VS7.1/python.iss b/PC/VS7.1/python.iss
index 70c9bf3..2f6c8b7 100644
--- a/PC/VS7.1/python.iss
+++ b/PC/VS7.1/python.iss
@@ -155,8 +155,8 @@
Source: DLLs\unicodedata.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main
Source: libs\unicodedata.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main
-Source: DLLs\_winreg.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main
-Source: libs\_winreg.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main
+Source: DLLs\winreg.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main
+Source: libs\winreg.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main
Source: DLLs\winsound.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main
Source: libs\winsound.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main
diff --git a/PC/VS7.1/python20.wse b/PC/VS7.1/python20.wse
index 6c1c387..8611b8e 100644
--- a/PC/VS7.1/python20.wse
+++ b/PC/VS7.1/python20.wse
@@ -1713,8 +1713,8 @@
Text=Extension module DLLs (.pyd); keep in synch with libs directory next
end
item: Install File
- Source=.\_winreg.pyd
- Destination=%MAINDIR%\DLLs\_winreg.pyd
+ Source=.\winreg.pyd
+ Destination=%MAINDIR%\DLLs\winreg.pyd
Description=Extension modules
Flags=0000000000000010
end
@@ -1809,8 +1809,8 @@
Text=Link libraries (.lib); keep in synch with DLLs above, except that the Python lib lives here.
end
item: Install File
- Source=.\_winreg.lib
- Destination=%MAINDIR%\libs\_winreg.lib
+ Source=.\winreg.lib
+ Destination=%MAINDIR%\libs\winreg.lib
Description=Link library files
Flags=0000000000000010
end
diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
index f06d626..38982f4 100644
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -401,7 +401,7 @@
RelativePath="..\..\Modules\_weakref.c">
</File>
<File
- RelativePath="..\..\Pc\_winreg.c">
+ RelativePath="..\..\Pc\winreg.c">
</File>
<File
RelativePath="..\..\Objects\abstract.c">
diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index 8e59dae..75414ce 100644
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -1559,7 +1559,7 @@
>
</File>
<File
- RelativePath="..\..\PC\_winreg.c"
+ RelativePath="..\..\PC\winreg.c"
>
</File>
<File
diff --git a/PC/config.c b/PC/config.c
index e3bbde7..1522533 100644
--- a/PC/config.c
+++ b/PC/config.c
@@ -42,7 +42,7 @@
extern void init_csv(void);
extern void init_sre(void);
extern void initparser(void);
-extern void init_winreg(void);
+extern void initwinreg(void);
extern void init_struct(void);
extern void initdatetime(void);
extern void init_functools(void);
@@ -116,7 +116,7 @@
{"_csv", init_csv},
{"_sre", init_sre},
{"parser", initparser},
- {"_winreg", init_winreg},
+ {"winreg", initwinreg},
{"_struct", init_struct},
{"datetime", initdatetime},
{"_functools", init_functools},
diff --git a/PC/_winreg.c b/PC/winreg.c
similarity index 99%
rename from PC/_winreg.c
rename to PC/winreg.c
index 8ba4863..1b141d3 100644
--- a/PC/_winreg.c
+++ b/PC/winreg.c
@@ -1,5 +1,5 @@
/*
- _winreg.c
+ winreg.c
Windows Registry access module for Python.
@@ -1355,7 +1355,7 @@
return NULL;
if (typ != REG_SZ) {
PyErr_SetString(PyExc_TypeError,
- "Type must be _winreg.REG_SZ");
+ "Type must be winreg.REG_SZ");
return NULL;
}
@@ -1565,10 +1565,10 @@
#define ADD_KEY(val) inskey(d, #val, val)
-PyMODINIT_FUNC init_winreg(void)
+PyMODINIT_FUNC initwinreg(void)
{
PyObject *m, *d;
- m = Py_InitModule3("_winreg", winreg_methods, module_doc);
+ m = Py_InitModule3("winreg", winreg_methods, module_doc);
if (m == NULL)
return;
d = PyModule_GetDict(m);