Rename zoneinfo module and source file

Instead of _czoneinfo generated from zoneinfomodule.c, we now have
_zoneinfo generated from _zoneinfo.c

Author: pganssle

Lib/test/test_zoneinfo/_support.py

@@ -35,7 +35,7 @@ def get_modules():
     """
     import zoneinfo as c_module
 
-    py_module = import_fresh_module("zoneinfo", blocked=["_czoneinfo"])
+    py_module = import_fresh_module("zoneinfo", blocked=["_zoneinfo"])
 
     return py_module, c_module
 

Lib/zoneinfo/__init__.py

@@ -10,7 +10,7 @@
 from ._common import ZoneInfoNotFoundError
 
 try:
-    from _czoneinfo import ZoneInfo
+    from _zoneinfo import ZoneInfo
 except ImportError:  # pragma: nocover
     from ._zoneinfo import ZoneInfo
 

Modules/Setup

@@ -181,7 +181,7 @@ _symtable symtablemodule.c
 #_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c	# elementtree accelerator
 #_pickle _pickle.c	# pickle accelerator
 #_datetime _datetimemodule.c	# datetime accelerator
-#_czoneinfo zoneinfomodule.c	# zoneinfo accelerator
+#_zoneinfo _zoneinfo.c	# zoneinfo accelerator
 #_bisect _bisectmodule.c	# Bisection algorithms
 #_heapq _heapqmodule.c	# Heap queue algorithm
 #_asyncio _asynciomodule.c  # Fast asyncio Future

Modules/zoneinfomodule.c renamed to Modules/_zoneinfo.c

@@ -8,9 +8,9 @@
 #include "datetime.h"
 
 // Imports
-PyObject *io_open = NULL;
-PyObject *_tzpath_find_tzfile = NULL;
-PyObject *_common_mod = NULL;
+static PyObject *io_open = NULL;
+static PyObject *_tzpath_find_tzfile = NULL;
+static PyObject *_common_mod = NULL;
 
 typedef struct TransitionRuleType TransitionRuleType;
 typedef struct StrongCacheNode StrongCacheNode;
@@ -2585,7 +2585,7 @@ static PyTypeObject PyZoneInfo_ZoneInfoType = {
 };
 
 /////
-// Specify the zoneinfo._czoneinfo module
+// Specify the _zoneinfo module
 static PyMethodDef module_methods[] = {{NULL, NULL}};
 static void
 module_free()
@@ -2681,15 +2681,15 @@ static PyModuleDef_Slot zoneinfomodule_slots[] = {
 
 static struct PyModuleDef zoneinfomodule = {
     PyModuleDef_HEAD_INIT,
-    .m_name = "zoneinfo._czoneinfo",
+    .m_name = "_zoneinfo",
     .m_doc = "C implementation of the zoneinfo module",
     .m_size = 0,
     .m_methods = module_methods,
     .m_slots = zoneinfomodule_slots,
     .m_free = (freefunc)module_free};
 
 PyMODINIT_FUNC
-PyInit__czoneinfo(void)
+PyInit__zoneinfo(void)
 {
     return PyModuleDef_Init(&zoneinfomodule);
 }

PCbuild/_czoneinfo.vcxproj renamed to PCbuild/_zoneinfo.vcxproj

@@ -68,7 +68,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}</ProjectGuid>
-    <RootNamespace>_czoneinfo</RootNamespace>
+    <RootNamespace>_zoneinfo</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="python.props" />
@@ -92,7 +92,7 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   </PropertyGroup>
   <ItemGroup>
-    <ClCompile Include="..\Modules\zoneinfomodule.c" />
+    <ClCompile Include="..\Modules\_zoneinfo.c" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\PC\python_nt.rc" />

PCbuild/_czoneinfo.vcxproj.filters renamed to PCbuild/_zoneinfo.vcxproj.filters

@@ -9,7 +9,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\Modules\zoneinfomodule.c">
+    <ClCompile Include="..\Modules\_zoneinfo.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>

PCbuild/pcbuild.proj

@@ -51,7 +51,7 @@
     <!-- pyshellext.dll -->
     <Projects Include="pyshellext.vcxproj" />
     <!-- Extension modules -->
-    <ExtensionModules Include="_asyncio;_czoneinfo;_decimal;_elementtree;_msi;_multiprocessing;_overlapped;pyexpat;_queue;select;unicodedata;winsound;_uuid" />
+    <ExtensionModules Include="_asyncio;_zoneinfo;_decimal;_elementtree;_msi;_multiprocessing;_overlapped;pyexpat;_queue;select;unicodedata;winsound;_uuid" />
     <ExtensionModules Include="_ctypes" Condition="$(IncludeCTypes)" />
     <!-- Extension modules that require external sources -->
     <ExternalModules Include="_bz2;_lzma;_sqlite3" />

PCbuild/pcbuild.sln

@@ -91,7 +91,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testconsole", "_testconsol
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_asyncio", "_asyncio.vcxproj", "{384C224A-7474-476E-A01B-750EA7DE918C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_czoneinfo", "_czoneinfo.vcxproj", "{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_zoneinfo", "_zoneinfo.vcxproj", "{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_queue", "_queue.vcxproj", "{78D80A15-BD8C-44E2-B49E-1F05B0A0A687}"
 EndProject

PCbuild/readme.txt

@@ -132,7 +132,7 @@ library which are implemented in C; each one builds a DLL (renamed to
 _asyncio
 _ctypes
 _ctypes_test
-_czoneinfo
+_zoneinfo
 _decimal
 _elementtree
 _hashlib

Tools/msi/lib/lib_files.wxs

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <?define exts=pyexpat;select;unicodedata;winsound;_bz2;_elementtree;_socket;_ssl;_msi;_ctypes;_hashlib;_multiprocessing;_lzma;_decimal;_overlapped;_sqlite3;_asyncio;_queue;_uuid;_czoneinfo ?>
+    <?define exts=pyexpat;select;unicodedata;winsound;_bz2;_elementtree;_socket;_ssl;_msi;_ctypes;_hashlib;_multiprocessing;_lzma;_decimal;_overlapped;_sqlite3;_asyncio;_queue;_uuid;_zoneinfo ?>
     <Fragment>
         <DirectoryRef Id="Lib_venv_scripts_nt" />
 

setup.py

@@ -819,7 +819,7 @@ def detect_simple_extensions(self):
         self.add(Extension('_datetime', ['_datetimemodule.c'],
                            libraries=['m']))
         # zoneinfo module
-        self.add(Extension('_czoneinfo', ['zoneinfomodule.c'])),
+        self.add(Extension('_zoneinfo', ['_zoneinfo.c'])),
         # random number generator implemented in C
         self.add(Extension("_random", ["_randommodule.c"],
                            extra_compile_args=['-DPy_BUILD_CORE_MODULE']))