Merge pull request #24943 from oscargus/pypyspecialcaseremoval

anntzer · web-flow · commit a95775e3aec3 · 2023-01-11T18:39:42.000+01:00
Remove special casing for PyPy not required anymore
diff --git a/src/_c_internal_utils.c b/src/_c_internal_utils.c
@@ -68,13 +68,7 @@ mpl_GetCurrentProcessExplicitAppUserModelID(PyObject* module)
     wchar_t* appid = NULL;
     HRESULT hr = GetCurrentProcessExplicitAppUserModelID(&appid);
     if (FAILED(hr)) {
-#if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x07030600
-        /* Remove when we require PyPy 7.3.6 */
-        PyErr_SetFromWindowsErr(hr);
-        return NULL;
-#else
         return PyErr_SetFromWindowsErr(hr);
-#endif
     }
     PyObject* py_appid = PyUnicode_FromWideChar(appid, -1);
     CoTaskMemFree(appid);
@@ -95,13 +89,7 @@ mpl_SetCurrentProcessExplicitAppUserModelID(PyObject* module, PyObject* arg)
     HRESULT hr = SetCurrentProcessExplicitAppUserModelID(appid);
     PyMem_Free(appid);
     if (FAILED(hr)) {
-#if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x07030600
-        /* Remove when we require PyPy 7.3.6 */
-        PyErr_SetFromWindowsErr(hr);
-        return NULL;
-#else
         return PyErr_SetFromWindowsErr(hr);
-#endif
     }
     Py_RETURN_NONE;
 #else
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -285,11 +285,7 @@ static void lazy_init(void) {
     NSApp = [NSApplication sharedApplication];
     [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
 
-#ifndef PYPY
-    /* TODO: remove ifndef after the new PyPy with the PyOS_InputHook implementation
-    get released: https://bitbucket.org/pypy/pypy/commits/caaf91a */
     PyOS_InputHook = wait_for_stdin;
-#endif
 
     WindowServerConnectionManager* connectionManager = [WindowServerConnectionManager sharedManager];
     NSWorkspace* workspace = [NSWorkspace sharedWorkspace];
diff --git a/src/_path.h b/src/_path.h
@@ -21,11 +21,6 @@
 #include "_backend_agg_basic_types.h"
 #include "numpy_cpp.h"
 
-/* Compatibility for PyPy3.7 before 7.3.4. */
-#ifndef Py_DTSF_ADD_DOT_0
-#define Py_DTSF_ADD_DOT_0 0x2
-#endif
-
 struct XY
 {
     double x;
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -575,19 +575,9 @@ static PyObject *PyFT2Font_get_fontmap(PyFT2Font *self, PyObject *args, PyObject
 
     if (PyUnicode_Check(textobj)) {
         size = PyUnicode_GET_LENGTH(textobj);
-#if defined(PYPY_VERSION) && (PYPY_VERSION_NUM < 0x07040000)
-        // PyUnicode_ReadChar is available from PyPy 7.3.2, but wheels do not
-        // specify the micro-release version, so put the version bound at 7.4
-        // to prevent generating wheels unusable on PyPy 7.3.{0,1}.
-        Py_UNICODE *unistr = PyUnicode_AsUnicode(textobj);
-        for (size_t i = 0; i < size; ++i) {
-            codepoints.insert(unistr[i]);
-        }
-#else
         for (size_t i = 0; i < size; ++i) {
             codepoints.insert(PyUnicode_ReadChar(textobj, i));
         }
-#endif
     } else {
         PyErr_SetString(PyExc_TypeError, "string must be str");
         return NULL;
@@ -656,19 +646,9 @@ static PyObject *PyFT2Font_set_text(PyFT2Font *self, PyObject *args, PyObject *k
     if (PyUnicode_Check(textobj)) {
         size = PyUnicode_GET_LENGTH(textobj);
         codepoints.resize(size);
-#if defined(PYPY_VERSION) && (PYPY_VERSION_NUM < 0x07040000)
-        // PyUnicode_ReadChar is available from PyPy 7.3.2, but wheels do not
-        // specify the micro-release version, so put the version bound at 7.4
-        // to prevent generating wheels unusable on PyPy 7.3.{0,1}.
-        Py_UNICODE *unistr = PyUnicode_AsUnicode(textobj);
-        for (size_t i = 0; i < size; ++i) {
-            codepoints[i] = unistr[i];
-        }
-#else
         for (size_t i = 0; i < size; ++i) {
             codepoints[i] = PyUnicode_ReadChar(textobj, i);
         }
-#endif
     } else {
         PyErr_SetString(PyExc_TypeError, "set_text requires str-input.");
         return NULL;
