Remove old py2.x cruft from pywintypes.h

Author: mhammond

win32/src/PyWinTypes.h

@@ -8,20 +8,6 @@
 #undef _POSIX_C_SOURCE
 #endif
 
-// early msvc versions complain about pragma #s it doesn't understand
-// C:\mssdk\VC\INCLUDE\string.h(142) : warning C4616: #pragma warning : warning number '6059' out of range, must be
-// between '4001' and '4999' and: C:\mssdk\include\wingdi.h(4340) : warning C4068: unknown pragma I doubt we ever care
-// about that warning, so unconditionally nuke em!
-#pragma warning(disable : 4616 4068)
-// Python.h and Windows.h both protect themselves from multiple
-// includes - so it is safe to do here (and provides a handy
-// choke point for #include vagaries
-
-// Some other warnings generated by MSVC6 which we don't care about
-#if (PY_VERSION_HEX < 0x02060000)
-#pragma warning(disable : 4035)
-#endif
-
 // windows rpc.h defines "small" as "char" which breaks Python's accu.h,
 // so we undefine it before including python.
 #ifdef small
@@ -46,29 +32,12 @@
 // Some macros to help the pywin32 modules co-exist in py2x and py3k.
 // Creates and initializes local variables called 'module' and 'dict'.
 
-#if (PY_VERSION_HEX < 0x03000000)
-
-// Use to define the function itself (ie, its name, linkage, params)
-#define PYWIN_MODULE_INIT_FUNC(module_name) extern "C" __declspec(dllexport) void init##module_name(void)
-
-// If the module needs to early-exit on an error condition.
-#define PYWIN_MODULE_INIT_RETURN_ERROR return;
-
-// When the module has successfully initialized.
-#define PYWIN_MODULE_INIT_RETURN_SUCCESS return;
-
-// To setup the module object itself and the module's dictionary.
-#define PYWIN_MODULE_INIT_PREPARE(module_name, functions, docstring) \
-    PyObject *dict, *module;                                         \
-    if (PyWinGlobals_Ensure() == -1)                                 \
-        return;                                                      \
-    if (!(module = Py_InitModule(#module_name, functions)))          \
-        return;                                                      \
-    if (!(dict = PyModule_GetDict(module)))                          \
-        return;
+// Maybe these should all be removed - they existed to help in the py2->3
+// transition.
+// On one hand: the code would be cleaner if they were all just re-inlined?
+// On the other: high confidence everything uses the exact same patterns?
+// (Regardless, *some*, eg, PYWIN_MODULE_INIT_RETURN_* should be re-inlined!)
 
-#else
-// py3k module helpers.
 // Use to define the function itself (ie, its name, linkage, params)
 #define PYWIN_MODULE_INIT_FUNC(module_name) extern "C" __declspec(dllexport) PyObject *PyInit_##module_name(void)
 
@@ -88,14 +57,8 @@
         return NULL;                                                                                        \
     if (!(dict = PyModule_GetDict(module)))                                                                 \
         return NULL;
-#endif  // PY_VERSION_HEX
 
 // Helpers for our types.
-#if (PY_VERSION_HEX < 0x03000000)
-#define PYWIN_OBJECT_HEAD PyObject_HEAD_INIT(&PyType_Type) 0,
-#define PYWIN_ATTR_CONVERT PyString_AsString
-
-#else  // Py3k definitions
 // Macro to handle PyObject layout changes in Py3k
 #define PYWIN_OBJECT_HEAD PyVarObject_HEAD_INIT(NULL, 0)
 
@@ -128,25 +91,8 @@
 #define PyInt_AsSsize_t PyLong_AsSsize_t
 #define PyInt_AsUnsignedLongMask PyLong_AsUnsignedLongMask
 #define PyNumber_Int PyNumber_Long
-#endif  // (PY_VERSION_HEX < 0x03000000)
-
-// See PEP-353 - this is the "official" test...
-#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
-// 2.3 and before have no Py_ssize_t
-typedef int Py_ssize_t;
-#define PyInt_FromSsize_t PyInt_FromLong
-#define PyInt_AsSsize_t PyInt_AsLong
-#define PY_SSIZE_T_MAX INT_MAX
-#define PY_SSIZE_T_MIN INT_MIN
-#endif
 
-// Py_hash_t was introduced as the size of a pointer in python 3.2 - it
-// was a simple long before that.
-#if PY_VERSION_HEX < 0x03020000
-typedef long Py_hash_t;
-#else
 typedef Py_ssize_t Py_hash_t;
-#endif
 
 // This only enables runtime checks in debug builds - so we use
 // our own so we can enable it always should we desire...
@@ -155,13 +101,6 @@ typedef Py_ssize_t Py_hash_t;
 // Lars: for WAVEFORMATEX
 #include "mmsystem.h"
 
-// *** NOTE *** FREEZE_PYWINTYPES is deprecated.  It used to be used
-// by the 'freeze' tool, but now py2exe etc do a far better job, and
-// don't require a custom built pywintypes DLL.
-#ifdef FREEZE_PYWINTYPES
-/* The pywintypes module is being included in a frozen .EXE/.DLL */
-#define PYWINTYPES_EXPORT
-#else
 #ifdef BUILD_PYWINTYPES
 /* We are building pywintypesxx.dll */
 #define PYWINTYPES_EXPORT __declspec(dllexport)
@@ -176,13 +115,10 @@ typedef Py_ssize_t Py_hash_t;
 #endif  // DEBUG/_DEBUG
 #endif  // _MSC_VER
 #endif  // BUILD_PYWINTYPES
-#endif  // FREEZE_PYWINTYPES
 
-#if (PY_VERSION_HEX >= 0x03000000)
-// Py3k uses memoryview object in place of buffer
+// Py3k uses memoryview object in place of buffer, and we don't yet.
 extern PYWINTYPES_EXPORT PyObject *PyBuffer_New(Py_ssize_t size);
 extern PYWINTYPES_EXPORT PyObject *PyBuffer_FromMemory(void *buf, Py_ssize_t size);
-#endif
 
 // Formats a python traceback into a character string - result must be free()ed
 PYWINTYPES_EXPORT char *GetPythonTraceback(PyObject *exc_type, PyObject *exc_value, PyObject *exc_tb);
@@ -224,24 +160,12 @@ PYWINTYPES_EXPORT BOOL PyWinObject_AsWCHAR(PyObject *stringObject, WCHAR **pResu
 // And free it when finished.
 PYWINTYPES_EXPORT void PyWinObject_FreeWCHAR(WCHAR *pResult);
 
-// As of Python 2.6, Python switched to 'wchar_t' for unicode, so old
-// win32 structures that still use 'unsigned short' now fail from C++ with
-// VS8 so we provide a couple of helpers.
-// XXX - but, when trying to use VC2003 with x64, the SDK x64 compiler
-// reports itself as 14.00.40310.41 - so this breaks under that compiler
-// Its not clear how to resolve this, but while VS2003 is the default
-// compiler, that is what must work.
-// py2.5 on x64 also needs it, and that is min x64 we support
-// The main difference seems to be whether the compiler has /Zc:wchar_t (Treat wchar_t as a builtin type)
-// on by default, and according to MSDN, _NATIVE_WCHAR_T_DEFINED is the way to check for it
-#ifdef _NATIVE_WCHAR_T_DEFINED
 inline BOOL PyWinObject_AsWCHAR(PyObject *stringObject, unsigned short **pResult, BOOL bNoneOK = FALSE,
                                 DWORD *pResultLen = NULL)
 {
     return PyWinObject_AsWCHAR(stringObject, (WCHAR **)pResult, bNoneOK, pResultLen);
 }
 inline void PyWinObject_FreeWCHAR(unsigned short *pResult) { PyWinObject_FreeWCHAR((WCHAR *)pResult); }
-#endif
 
 // Given a PyObject (string, Unicode, etc) create a "char *" with the value
 // if pResultLen != NULL, it will be set to the result size NOT INCLUDING