summaryrefslogtreecommitdiff
path: root/Include/pyerrors.h
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2017-02-04 09:19:04 +0300
committerBerker Peksag <berker.peksag@gmail.com>2017-02-04 09:19:04 +0300
commitb53991455f7f258ede7a26b69c2be5b8138b9f8a (patch)
tree3615cf0ef453ab113a547b1dfebacf415ed32602 /Include/pyerrors.h
parent678487eb345f9f9dea3d3818ecad7d39145bdc65 (diff)
parent9bfb9694a65124a8191cdb8ce7992445d1d0f4d2 (diff)
downloadcpython-b53991455f7f258ede7a26b69c2be5b8138b9f8a.tar.gz
Issue #29198: Merge from 3.6
Diffstat (limited to 'Include/pyerrors.h')
-rw-r--r--Include/pyerrors.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index 8c1dbc5047..4540385446 100644
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -252,7 +252,7 @@ PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilename(
);
#if defined(MS_WINDOWS) && !defined(Py_LIMITED_API)
PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithUnicodeFilename(
- PyObject *, const Py_UNICODE *);
+ PyObject *, const Py_UNICODE *) Py_DEPRECATED(3.3);
#endif /* MS_WINDOWS */
PyAPI_FUNC(PyObject *) PyErr_Format(
@@ -286,7 +286,7 @@ PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilename(
#ifndef Py_LIMITED_API
/* XXX redeclare to use WSTRING */
PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithUnicodeFilename(
- int, const Py_UNICODE *);
+ int, const Py_UNICODE *) Py_DEPRECATED(3.3);
#endif
PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErr(int);
PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilenameObject(
@@ -302,7 +302,7 @@ PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilename(
);
#ifndef Py_LIMITED_API
PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithUnicodeFilename(
- PyObject *,int, const Py_UNICODE *);
+ PyObject *,int, const Py_UNICODE *) Py_DEPRECATED(3.3);
#endif
PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErr(PyObject *, int);
#endif /* MS_WINDOWS */
@@ -406,7 +406,7 @@ PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_Create(
Py_ssize_t start,
Py_ssize_t end,
const char *reason /* UTF-8 encoded string */
- );
+ ) Py_DEPRECATED(3.3);
#endif
/* create a UnicodeTranslateError object */
@@ -417,7 +417,7 @@ PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_Create(
Py_ssize_t start,
Py_ssize_t end,
const char *reason /* UTF-8 encoded string */
- );
+ ) Py_DEPRECATED(3.3);
PyAPI_FUNC(PyObject *) _PyUnicodeTranslateError_Create(
PyObject *object,
Py_ssize_t start,