summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-02-16 21:09:09 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-02-16 21:09:09 (GMT)
commit5781f32b4f8d9dd35e9980d4da99d1420339e920 (patch)
treeaa3e4abc3961755c905408342718e2535e07516d
parent062a7c3675af79966fbe75a9e552ccd2a4b26dd5 (diff)
downloadcpython-5781f32b4f8d9dd35e9980d4da99d1420339e920.zip
cpython-5781f32b4f8d9dd35e9980d4da99d1420339e920.tar.gz
cpython-5781f32b4f8d9dd35e9980d4da99d1420339e920.tar.bz2
remove some PyBytes_* aliases that are not in 3.x
-rw-r--r--Include/bytesobject.h6
-rw-r--r--Misc/NEWS2
2 files changed, 2 insertions, 6 deletions
diff --git a/Include/bytesobject.h b/Include/bytesobject.h
index a50792c..1083da9 100644
--- a/Include/bytesobject.h
+++ b/Include/bytesobject.h
@@ -23,11 +23,5 @@
#define _PyBytes_FormatLong _PyString_FormatLong
#define PyBytes_DecodeEscape PyString_DecodeEscape
#define _PyBytes_Join _PyString_Join
-#define PyBytes_Decode PyString_Decode
-#define PyBytes_Encode PyString_Encode
-#define PyBytes_AsEncodedObject PyString_AsEncodedObject
-#define PyBytes_AsEncodedString PyString_AsEncodedString
-#define PyBytes_AsDecodedObject PyString_AsDecodedObject
-#define PyBytes_AsDecodedString PyString_AsDecodedString
#define PyBytes_AsStringAndSize PyString_AsStringAndSize
#define _PyBytes_InsertThousandsGrouping _PyString_InsertThousandsGrouping
diff --git a/Misc/NEWS b/Misc/NEWS
index 142026c..3e37c28 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -506,6 +506,8 @@ Build
C-API
-----
+- Some PyBytes_* aliases have been removed because they don't exist in 3.x.
+
- Issue #5175: PyLong_AsUnsignedLongLong now raises OverflowError
for negative arguments. Previously, it raised TypeError.