diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2019-06-07 10:39:11 +0200 |
|---|---|---|
| committer | Noel Power <npower@samba.org> | 2019-06-24 17:24:27 +0000 |
| commit | f498c819664e9df658651d39f616f5b4d62b4750 (patch) | |
| tree | b4849a8c497c3b38027af5c444ea3828418f19a2 /python/py3compat.h | |
| parent | 559dd2d25a644239902753e842b808bac1a0b439 (diff) | |
| download | samba-f498c819664e9df658651d39f616f5b4d62b4750.tar.gz | |
py3: Remove PyStr_Check() compatability macro
We no longer need Samba to be py2/py3 compatible so we choose to return to the standard
function names.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Noel Power <noel.power@suse.com>
Diffstat (limited to 'python/py3compat.h')
| -rw-r--r-- | python/py3compat.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/python/py3compat.h b/python/py3compat.h index a66e940001d..9a98339d916 100644 --- a/python/py3compat.h +++ b/python/py3compat.h @@ -54,7 +54,6 @@ /* Strings */ -#define PyStr_Check PyUnicode_Check #define PyStr_FromString PyUnicode_FromString #define PyStr_FromStringAndSize PyUnicode_FromStringAndSize #define PyStr_FromFormat PyUnicode_FromFormat @@ -77,7 +76,7 @@ #define IsPy3Bytes PyBytes_Check #define IsPy3BytesOrString(pystr) \ - (PyStr_Check(pystr) || PyBytes_Check(pystr)) + (PyUnicode_Check(pystr) || PyBytes_Check(pystr)) /* Ints */ |