Skip to content

Commit 38d2b77

Browse files
authored
Change PendingDeprecationWarning to DeprecationWarning (mhammond#2503)
1 parent 805258d commit 38d2b77

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

com/win32com/src/PythonCOM.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -777,14 +777,14 @@ static PyObject *pythoncom_WrapObject(PyObject *self, PyObject *args)
777777

778778
static PyObject *pythoncom_MakeIID(PyObject *self, PyObject *args)
779779
{
780-
PyErr_Warn(PyExc_PendingDeprecationWarning, "MakeIID is deprecated - please use pywintypes.IID() instead.");
780+
PyErr_Warn(PyExc_DeprecationWarning, "MakeIID is deprecated - please use pywintypes.IID() instead.");
781781
return PyWinMethod_NewIID(self, args);
782782
}
783783

784784
// no autoduck - this is deprecated.
785785
static PyObject *pythoncom_MakeTime(PyObject *self, PyObject *args)
786786
{
787-
PyErr_Warn(PyExc_PendingDeprecationWarning, "MakeTime is deprecated - please use pywintypes.Time() instead.");
787+
PyErr_Warn(PyExc_DeprecationWarning, "MakeTime is deprecated - please use pywintypes.Time() instead.");
788788
return PyWinMethod_NewTime(self, args);
789789
}
790790

win32/Lib/regcheck.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import warnings
55

66
warnings.warn(
7-
"The regcheck module has been pending deprecation since build 210",
8-
category=PendingDeprecationWarning,
7+
"The regcheck module has been deprecated and pending removal since build 210",
8+
category=DeprecationWarning,
99
)
1010

1111
import os

win32/src/PyLARGE_INTEGER.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ BOOL PyWinObject_AsLARGE_INTEGER(PyObject *ob, LARGE_INTEGER *pResult)
2525
return !(pResult->QuadPart == -1 && PyErr_Occurred());
2626
}
2727
else {
28-
PyErr_Warn(PyExc_PendingDeprecationWarning,
28+
PyErr_Warn(PyExc_DeprecationWarning,
2929
"Support for passing 2 integers to create a 64bit value is deprecated - pass a long instead");
3030
long hiVal, loVal;
3131
if (!PyArg_ParseTuple(ob, "ll", &hiVal, &loVal)) {
@@ -50,7 +50,7 @@ BOOL PyWinObject_AsULARGE_INTEGER(PyObject *ob, ULARGE_INTEGER *pResult)
5050
PyErr_SetString(PyExc_TypeError, "ULARGE_INTEGER must be 'int', or '(int, int)'");
5151
return FALSE;
5252
}
53-
PyErr_Warn(PyExc_PendingDeprecationWarning,
53+
PyErr_Warn(PyExc_DeprecationWarning,
5454
"Support for passing 2 integers to create a 64bit value is deprecated - pass a long instead");
5555
pResult->QuadPart = (((__int64)hiVal) << 32) | loVal;
5656
return TRUE;

win32/src/win32crypt/PyCERTSTORE.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ PyObject *PyCERTSTORE::PyCertCloseStore(PyObject *self, PyObject *args, PyObject
144144
return NULL;
145145
}
146146
if (dwFlags != (DWORD)-1) {
147-
PyErr_Warn(PyExc_PendingDeprecationWarning,
147+
PyErr_Warn(PyExc_DeprecationWarning,
148148
"The Flags param to CertCloseStore is deprecated; a non-zero value is likely to crash");
149149
}
150150
BOOL bsuccess;

win32/src/win32gui.i

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1499,7 +1499,7 @@ static PyObject *PyGetObjectType(PyObject *self, PyObject *args)
14991499

15001500
static PyObject *PyMakeBuffer(PyObject *self, PyObject *args)
15011501
{
1502-
PyErr_Warn(PyExc_PendingDeprecationWarning, "PyMakeBuffer is deprecated; use PyGetMemory instead");
1502+
PyErr_Warn(PyExc_DeprecationWarning, "PyMakeBuffer is deprecated; use PyGetMemory instead");
15031503
size_t len;
15041504
void *addr=NULL;
15051505
#ifdef _WIN64

0 commit comments

Comments
 (0)