Move Include/pystrhex.h to Include/cpython/pystrhex.h

nw0 · nw0 · commit 58d1ad6976fb · 2021-03-06T13:22:59.000+08:00
diff --git a/Include/Python.h b/Include/Python.h
@@ -157,6 +157,7 @@
 #include "cpython/pyctype.h"
 #include "pystrtod.h"
 #include "pystrcmp.h"
+#include "cpython/pystrhex.h"
 #include "fileutils.h"
 #include "cpython/pyfpe.h"
 #include "tracemalloc.h"
diff --git a/Include/cpython/pystrhex.h b/Include/cpython/pystrhex.h
diff --git a/Makefile.pre.in b/Makefile.pre.in
@@ -1072,7 +1072,6 @@ PYTHON_HEADERS= \
 		$(srcdir)/Include/pyport.h \
 		$(srcdir)/Include/pystate.h \
 		$(srcdir)/Include/pystrcmp.h \
-		$(srcdir)/Include/pystrhex.h \
 		$(srcdir)/Include/pystrtod.h \
 		$(srcdir)/Include/pythonrun.h \
 		$(srcdir)/Include/pythread.h \
@@ -1122,6 +1121,7 @@ PYTHON_HEADERS= \
 		$(srcdir)/Include/cpython/pylifecycle.h \
 		$(srcdir)/Include/cpython/pymem.h \
 		$(srcdir)/Include/cpython/pystate.h \
+		$(srcdir)/Include/cpython/pystrhex.h \
 		$(srcdir)/Include/cpython/pythonrun.h \
 		$(srcdir)/Include/cpython/pytime.h \
 		$(srcdir)/Include/cpython/sysmodule.h \
diff --git a/Modules/_blake2/blake2b_impl.c b/Modules/_blake2/blake2b_impl.c
@@ -14,7 +14,6 @@
  */
 
 #include "Python.h"
-#include "pystrhex.h"
 
 #include "../hashlib.h"
 #include "blake2ns.h"
diff --git a/Modules/_blake2/blake2s_impl.c b/Modules/_blake2/blake2s_impl.c
@@ -14,7 +14,6 @@
  */
 
 #include "Python.h"
-#include "pystrhex.h"
 
 #include "../hashlib.h"
 #include "blake2ns.h"
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
@@ -15,7 +15,6 @@
 
 #include "Python.h"
 #include "hashlib.h"
-#include "pystrhex.h"
 
 
 /* EVP is the preferred interface to hashing in OpenSSL */
diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c
@@ -16,7 +16,6 @@
  */
 
 #include "Python.h"
-#include "pystrhex.h"
 #include "../hashlib.h"
 
 /* **************************************************************************
diff --git a/Modules/binascii.c b/Modules/binascii.c
@@ -56,7 +56,6 @@
 #define PY_SSIZE_T_CLEAN
 
 #include "Python.h"
-#include "pystrhex.h"
 #ifdef USE_ZLIB_CRC32
 #include "zlib.h"
 #endif
diff --git a/Modules/md5module.c b/Modules/md5module.c
@@ -18,7 +18,6 @@
 
 #include "Python.h"
 #include "hashlib.h"
-#include "pystrhex.h"
 
 /*[clinic input]
 module _md5
diff --git a/Modules/sha1module.c b/Modules/sha1module.c
@@ -18,7 +18,6 @@
 
 #include "Python.h"
 #include "hashlib.h"
-#include "pystrhex.h"
 
 /*[clinic input]
 module _sha1
diff --git a/Modules/sha256module.c b/Modules/sha256module.c
@@ -20,7 +20,6 @@
 #include "pycore_bitutils.h"      // _Py_bswap32()
 #include "structmember.h"         // PyMemberDef
 #include "hashlib.h"
-#include "pystrhex.h"
 
 /*[clinic input]
 module _sha256
diff --git a/Modules/sha512module.c b/Modules/sha512module.c
@@ -20,7 +20,6 @@
 #include "pycore_bitutils.h"      // _Py_bswap64()
 #include "structmember.h"         // PyMemberDef
 #include "hashlib.h"
-#include "pystrhex.h"
 
 /*[clinic input]
 module _sha512
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
@@ -6,7 +6,6 @@
 #include "pycore_bytes_methods.h"
 #include "pycore_object.h"
 #include "bytesobject.h"
-#include "pystrhex.h"
 
 /*[clinic input]
 class bytearray "PyByteArrayObject *" "&PyByteArray_Type"
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
@@ -10,7 +10,6 @@
 #include "pycore_object.h"        // _PyObject_GC_TRACK
 #include "pycore_pymem.h"         // PYMEM_CLEANBYTE
 
-#include "pystrhex.h"
 #include <stddef.h>
 
 /*[clinic input]
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
@@ -13,7 +13,6 @@
 #include "Python.h"
 #include "pycore_abstract.h"   // _PyIndex_Check()
 #include "pycore_object.h"
-#include "pystrhex.h"
 #include <stddef.h>
 
 /*[clinic input]
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
@@ -153,6 +153,7 @@
     <ClInclude Include="..\Include\cpython\pylifecycle.h" />
     <ClInclude Include="..\Include\cpython\pymem.h" />
     <ClInclude Include="..\Include\cpython\pystate.h" />
+    <ClInclude Include="..\Include\cpython\pystrhex.h" />
     <ClInclude Include="..\Include\cpython\pythonrun.h" />
     <ClInclude Include="..\Include\cpython\pytime.h" />
     <ClInclude Include="..\Include\cpython\sysmodule.h" />
@@ -242,7 +243,6 @@
     <ClInclude Include="..\Include\pyport.h" />
     <ClInclude Include="..\Include\pystate.h" />
     <ClInclude Include="..\Include\pystrcmp.h" />
-    <ClInclude Include="..\Include\pystrhex.h" />
     <ClInclude Include="..\Include\pystrtod.h" />
     <ClInclude Include="..\Include\pythonrun.h" />
     <ClInclude Include="..\Include\pythread.h" />
diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
@@ -204,9 +204,6 @@
     <ClInclude Include="..\Include\pystrtod.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\pystrhex.h">
-      <Filter>Include</Filter>
-    </ClInclude>
     <ClInclude Include="..\Include\Python-ast.h">
       <Filter>Include</Filter>
     </ClInclude>
@@ -450,6 +447,9 @@
     <ClInclude Include="..\Include\cpython\pylifecycle.h">
       <Filter>Include\cpython</Filter>
     </ClInclude>
+    <ClInclude Include="..\Include\cpython\pystrhex.h">
+      <Filter>Include</Filter>
+    </ClInclude>
     <ClInclude Include="..\Include\cpython\pytime.h">
       <Filter>Include\cpython</Filter>
     </ClInclude>
diff --git a/Python/pystrhex.c b/Python/pystrhex.c
@@ -2,8 +2,6 @@
 
 #include "Python.h"
 
-#include "pystrhex.h"
-
 static PyObject *_Py_strhex_impl(const char* argbuf, const Py_ssize_t arglen,
                                  const PyObject* sep, int bytes_per_sep_group,
                                  const int return_bytes)
