bpo-41123: Remove PyLong_FromUnicode() (GH-21204)

diff --git a/Doc/c-api/long.rst b/Doc/c-api/long.rst
index a7bd43df90689d753ea6c2a7e5caec524b52ebbc..3921a93843e422712aab3fbc57848607c009f8b9 100644 (file)
--- a/Doc/c-api/long.rst
+++ b/Doc/c-api/long.rst
@@ -94,17 +94,6 @@ distinguished from a number.  Use :c:func:`PyErr_Occurred` to disambiguate.
    are no digits, :exc:`ValueError` will be raised.
 
 
-.. c:function:: PyObject* PyLong_FromUnicode(Py_UNICODE *u, Py_ssize_t length, int base)
-
-   Convert a sequence of Unicode digits to a Python integer value.  The Unicode
-   string is first encoded to a byte string using :c:func:`PyUnicode_EncodeDecimal`
-   and then converted using :c:func:`PyLong_FromString`.
-
-   .. deprecated-removed:: 3.3 4.0
-      Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using
-      :c:func:`PyLong_FromUnicodeObject`.
-
-
 .. c:function:: PyObject* PyLong_FromUnicodeObject(PyObject *u, int base)
 
    Convert a sequence of Unicode digits in the string *u* to a Python integer

diff --git a/Doc/data/refcounts.dat b/Doc/data/refcounts.dat
index 1215c96cd5342e2c506c696582b3bc6d0c24fa44..4d9aee370c61d5f50019c7f7924bd1cd197aa522 100644 (file)
--- a/Doc/data/refcounts.dat
+++ b/Doc/data/refcounts.dat
@@ -1205,11 +1205,6 @@ PyLong_FromString:const char*:str::
 PyLong_FromString:char**:pend::
 PyLong_FromString:int:base::
 
-PyLong_FromUnicode:PyObject*::+1:
-PyLong_FromUnicode:Py_UNICODE*:u::
-PyLong_FromUnicode:Py_ssize_t:length::
-PyLong_FromUnicode:int:base::
-
 PyLong_FromUnicodeObject:PyObject*::+1:
 PyLong_FromUnicodeObject:PyObject*:u:0:
 PyLong_FromUnicodeObject:int:base::

diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
index 0dd33131f04300348fbcbcc5a4508595cfee469f..0c4ff026bd201eac9d061103788451bd946f6cfc 100644 (file)
--- a/Doc/whatsnew/3.10.rst
+++ b/Doc/whatsnew/3.10.rst
@@ -226,3 +226,6 @@ Removed
 
 * Removed ``PyUnicode_GetMax()``. Please migrate to new (:pep:`393`) APIs.
   (Contributed by Inada Naoki in :issue:`41103`.)
+
+* Removed ``PyLong_FromUnicode()``. Please migrate to :c:func:`PyLong_FromUnicodeObject`.
+  (Contributed by Inada Naoki in :issue:`41103`.)

diff --git a/Include/longobject.h b/Include/longobject.h
index dad08c23f82113836af5be80cfdce8c21ba0bd90..06e3e2490401e44c58b4632db8fe547c797631bf 100644 (file)
--- a/Include/longobject.h
+++ b/Include/longobject.h
@@ -102,8 +102,6 @@ PyAPI_FUNC(long long) PyLong_AsLongLongAndOverflow(PyObject *, int *);
 
 PyAPI_FUNC(PyObject *) PyLong_FromString(const char *, char **, int);
 #ifndef Py_LIMITED_API
-Py_DEPRECATED(3.3)
-PyAPI_FUNC(PyObject *) PyLong_FromUnicode(Py_UNICODE*, Py_ssize_t, int);
 PyAPI_FUNC(PyObject *) PyLong_FromUnicodeObject(PyObject *u, int base);
 PyAPI_FUNC(PyObject *) _PyLong_FromBytes(const char *, Py_ssize_t, int);
 #endif

diff --git a/Misc/NEWS.d/next/C API/2020-06-29-11-33-49.bpo-41123.qFevek.rst b/Misc/NEWS.d/next/C API/2020-06-29-11-33-49.bpo-41123.qFevek.rst
new file mode 100644 (file)
index 0000000..1f58135
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2020-06-29-11-33-49.bpo-41123.qFevek.rst
@@ -0,0 +1 @@
+Removed ``PyLong_FromUnicode()``.

diff --git a/Objects/abstract.c b/Objects/abstract.c
index 0d3f4ac6e174719517084235bf2c384b4382460d..3494f33ce380ca0af4f271f1cbb346361b8d1730 100644 (file)
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -1429,7 +1429,7 @@ PyNumber_Long(PyObject *o)
         return NULL;
 
     if (PyUnicode_Check(o))
-        /* The below check is done in PyLong_FromUnicode(). */
+        /* The below check is done in PyLong_FromUnicodeObject(). */
         return PyLong_FromUnicodeObject(o, 10);
 
     if (PyBytes_Check(o))

diff --git a/Objects/longobject.c b/Objects/longobject.c
index d00a7a048ddce228af1a81f8f683985f958c05dc..571f53a3c00eb57ea65844ce1727f0b90f34b64e 100644 (file)
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -2503,17 +2503,6 @@ _PyLong_FromBytes(const char *s, Py_ssize_t len, int base)
     return NULL;
 }
 
-PyObject *
-PyLong_FromUnicode(Py_UNICODE *u, Py_ssize_t length, int base)
-{
-    PyObject *v, *unicode = PyUnicode_FromWideChar(u, length);
-    if (unicode == NULL)
-        return NULL;
-    v = PyLong_FromUnicodeObject(unicode, base);
-    Py_DECREF(unicode);
-    return v;
-}
-
 PyObject *
 PyLong_FromUnicodeObject(PyObject *u, int base)
 {