PyErr_Warn is deprecated in 2.5 - goes away for 3.0
diff --git a/Python/errors.c b/Python/errors.c
index 3770522..62e63ab 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -670,17 +670,6 @@
}
}
-/* PyErr_Warn is only for backwards compatability and will be removed.
- Use PyErr_WarnEx instead. */
-
-#undef PyErr_Warn
-
-PyAPI_FUNC(int)
-PyErr_Warn(PyObject *category, char *message)
-{
- return PyErr_WarnEx(category, message, 1);
-}
-
/* Warning with explicit origin */
int
PyErr_WarnExplicit(PyObject *category, const char *message,
diff --git a/Python/import.c b/Python/import.c
index bb40b68..7ac9e2a 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -1320,8 +1320,8 @@
sprintf(warnstr, "Not importing directory "
"'%.*s': missing __init__.py",
MAXPATHLEN, buf);
- if (PyErr_Warn(PyExc_ImportWarning,
- warnstr)) {
+ if (PyErr_WarnEx(PyExc_ImportWarning,
+ warnstr, 1)) {
return NULL;
}
}
@@ -1339,8 +1339,8 @@
sprintf(warnstr, "Not importing directory "
"'%.*s': missing __init__.py",
MAXPATHLEN, buf);
- if (PyErr_Warn(PyExc_ImportWarning,
- warnstr)) {
+ if (PyErr_WarnEx(PyExc_ImportWarning,
+ warnstr, 1)) {
return NULL;
}
}
diff --git a/Python/modsupport.c b/Python/modsupport.c
index d29fe9b..8f25ed2 100644
--- a/Python/modsupport.c
+++ b/Python/modsupport.c
@@ -42,7 +42,7 @@
api_version_warning, name,
PYTHON_API_VERSION, name,
module_api_version);
- if (PyErr_Warn(PyExc_RuntimeWarning, message))
+ if (PyErr_WarnEx(PyExc_RuntimeWarning, message, 1))
return NULL;
}
/* Make sure name is fully qualified.
diff --git a/Python/structmember.c b/Python/structmember.c
index e0014c4..3eb7218 100644
--- a/Python/structmember.c
+++ b/Python/structmember.c
@@ -90,10 +90,10 @@
return v;
}
-#define WARN(msg) \
- do { \
- if (PyErr_Warn(PyExc_RuntimeWarning, msg) < 0) \
- return -1; \
+#define WARN(msg) \
+ do { \
+ if (PyErr_WarnEx(PyExc_RuntimeWarning, msg, 1) < 0) \
+ return -1; \
} while (0)
int