summaryrefslogtreecommitdiffstats
path: root/Include/unicodeobject.h
diff options
context:
space:
mode:
authorZackery Spytz <zspytz@gmail.com>2019-05-28 15:16:33 (GMT)
committerVictor Stinner <vstinner@redhat.com>2019-05-28 15:16:33 (GMT)
commit3c8724fc60163f4f3c3b0d531c84cc7b36783f82 (patch)
treebb195253b921a259f0a6e02ffc80f4eb6ad16738 /Include/unicodeobject.h
parent17a5588740b3d126d546ad1a13bdac4e028e6d50 (diff)
downloadcpython-3c8724fc60163f4f3c3b0d531c84cc7b36783f82.zip
cpython-3c8724fc60163f4f3c3b0d531c84cc7b36783f82.tar.gz
cpython-3c8724fc60163f4f3c3b0d531c84cc7b36783f82.tar.bz2
bpo-33407: Implement Py_DEPRECATED() on MSVC (GH-8980)
Diffstat (limited to 'Include/unicodeobject.h')
-rw-r--r--Include/unicodeobject.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
index 503aeb5..6d141b3 100644
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -174,9 +174,9 @@ PyAPI_FUNC(Py_ssize_t) PyUnicode_GetLength(
/* Get the number of Py_UNICODE units in the
string representation. */
-PyAPI_FUNC(Py_ssize_t) PyUnicode_GetSize(
+Py_DEPRECATED(3.3) PyAPI_FUNC(Py_ssize_t) PyUnicode_GetSize(
PyObject *unicode /* Unicode object */
- ) Py_DEPRECATED(3.3);
+ );
#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
/* Read a character from the string. */
@@ -381,11 +381,11 @@ PyAPI_FUNC(PyObject*) PyUnicode_Decode(
Use PyCodec_Decode() to decode with rot13 and non-standard codecs
that decode from str. */
-PyAPI_FUNC(PyObject*) PyUnicode_AsDecodedObject(
+Py_DEPRECATED(3.6) PyAPI_FUNC(PyObject*) PyUnicode_AsDecodedObject(
PyObject *unicode, /* Unicode object */
const char *encoding, /* encoding */
const char *errors /* error handling */
- ) Py_DEPRECATED(3.6);
+ );
/* Decode a Unicode object unicode and return the result as Unicode
object.
@@ -394,11 +394,11 @@ PyAPI_FUNC(PyObject*) PyUnicode_AsDecodedObject(
Use PyCodec_Decode() to decode with rot13 and non-standard codecs
that decode from str to str. */
-PyAPI_FUNC(PyObject*) PyUnicode_AsDecodedUnicode(
+Py_DEPRECATED(3.6) PyAPI_FUNC(PyObject*) PyUnicode_AsDecodedUnicode(
PyObject *unicode, /* Unicode object */
const char *encoding, /* encoding */
const char *errors /* error handling */
- ) Py_DEPRECATED(3.6);
+ );
/* Encodes a Unicode object and returns the result as Python
object.
@@ -408,11 +408,11 @@ PyAPI_FUNC(PyObject*) PyUnicode_AsDecodedUnicode(
Use PyCodec_Encode() for encoding with rot13 and non-standard codecs
that encode form str to non-bytes. */
-PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedObject(
+Py_DEPRECATED(3.6) PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedObject(
PyObject *unicode, /* Unicode object */
const char *encoding, /* encoding */
const char *errors /* error handling */
- ) Py_DEPRECATED(3.6);
+ );
/* Encodes a Unicode object and returns the result as Python string
object. */
@@ -430,11 +430,11 @@ PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedString(
Use PyCodec_Encode() to encode with rot13 and non-standard codecs
that encode from str to str. */
-PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedUnicode(
+Py_DEPRECATED(3.6) PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedUnicode(
PyObject *unicode, /* Unicode object */
const char *encoding, /* encoding */
const char *errors /* error handling */
- ) Py_DEPRECATED(3.6);
+ );
/* Build an encoding map. */