py3: Remove PyStr_FromString() compatability macro

[bbaumbach/samba-autobuild/.git] / python / py3compat.h

diff --git a/python/py3compat.h b/python/py3compat.h
index 01559980f172b75e387573bd7ff4e5ff303d5e35..bb35673c1a1ca6754946c9cc7ef557d916a9621c 100644 (file)
--- a/python/py3compat.h
+++ b/python/py3compat.h
@@ -54,9 +54,6 @@
 
 /* Strings */
 
-#define PyStr_Type PyUnicode_Type
-#define PyStr_Check PyUnicode_Check
-#define PyStr_FromString PyUnicode_FromString
 #define PyStr_FromStringAndSize PyUnicode_FromStringAndSize
 #define PyStr_FromFormat PyUnicode_FromFormat
 #define PyStr_FromFormatV PyUnicode_FromFormatV
@@ -78,7 +75,7 @@
 #define IsPy3Bytes PyBytes_Check
 
 #define IsPy3BytesOrString(pystr) \
-    (PyStr_Check(pystr) || PyBytes_Check(pystr))
+    (PyUnicode_Check(pystr) || PyBytes_Check(pystr))
 
 
 /* Ints */
@@ -87,9 +84,6 @@
 #define PyInt_Check PyLong_Check
 #define PyInt_FromLong PyLong_FromLong
 #define PyInt_AsLong PyLong_AsLong
-#define PyInt_AS_LONG PyLong_AS_LONG
-#define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask
-#define PyInt_AsSsize_t PyLong_AsSsize_t
 
 /* Module init */