py3: Remove PyStr_FromString() compatability macro

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

diff --git a/python/py3compat.h b/python/py3compat.h
index d502d18fa5389d7d8fbe6b309afbe756c3d3aec9..bb35673c1a1ca6754946c9cc7ef557d916a9621c 100644 (file)
--- a/python/py3compat.h
+++ b/python/py3compat.h
@@ -54,22 +54,16 @@
 
 /* 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
 #define PyStr_AsString PyUnicode_AsUTF8
-#define PyStr_Decode PyUnicode_Decode
 
-#define PyStr_AsUTF8String PyUnicode_AsUTF8String // returns PyBytes
 #define PyStr_AsUTF8 PyUnicode_AsUTF8
 #define PyStr_AsUTF8AndSize PyUnicode_AsUTF8AndSize
 
-/* description of bytes and string objects */
+/* description of bytes objects */
 #define PY_DESC_PY3_BYTES "bytes"
-#define PY_DESC_PY3_STRING "string"
 
 /* Determine if object is really bytes, for code that runs
  * in python2 & python3 (note: PyBytes_Check is replaced by
@@ -81,22 +75,15 @@
 #define IsPy3Bytes PyBytes_Check
 
 #define IsPy3BytesOrString(pystr) \
-    (PyStr_Check(pystr) || PyBytes_Check(pystr))
+    (PyUnicode_Check(pystr) || PyBytes_Check(pystr))
 
 
 /* Ints */
 
 #define PyInt_Type PyLong_Type
 #define PyInt_Check PyLong_Check
-#define PyInt_CheckExact PyLong_CheckExact
-#define PyInt_FromString PyLong_FromString
 #define PyInt_FromLong PyLong_FromLong
-#define PyInt_FromSsize_t PyLong_FromSsize_t
-#define PyInt_FromSize_t PyLong_FromSize_t
 #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 */