diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-04 17:47:40 -0400 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-21 01:32:23 +0000 |
| commit | b1a91377a8352bb0f450e8bedbd5082d88066083 (patch) | |
| tree | d59931925ffd79f7ad5737e3d327c442462dd055 | |
| parent | 39beab95c635374ca0e9aa50fdce2c02e85efdca (diff) | |
| download | talos-openbmc-b1a91377a8352bb0f450e8bedbd5082d88066083.tar.gz talos-openbmc-b1a91377a8352bb0f450e8bedbd5082d88066083.zip | |
Revert "python-dbus dbus.Byte.__str__ produces broken utf8"
This reverts commit 3579dc63b8ab8e12fe6078937449f48ab3b9d66c.
Now that the JSON library is fixed in Python this hack can be
removed from dbus-python.
Tested: verified encoding of dbus.Byte unchanged
Change-Id: I26f837cf41c471051e0ecf0dc1d1ee78aa586b6f
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
| -rw-r--r-- | meta-phosphor/common/recipes-devtools/python/python-dbus/bytes.patch | 37 | ||||
| -rw-r--r-- | meta-phosphor/common/recipes-devtools/python/python-dbus_%.bbappend | 2 |
2 files changed, 0 insertions, 39 deletions
diff --git a/meta-phosphor/common/recipes-devtools/python/python-dbus/bytes.patch b/meta-phosphor/common/recipes-devtools/python/python-dbus/bytes.patch deleted file mode 100644 index d8a10a063..000000000 --- a/meta-phosphor/common/recipes-devtools/python/python-dbus/bytes.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: dbus-python-1.2.0/_dbus_bindings/bytes.c -=================================================================== ---- dbus-python-1.2.0.orig/_dbus_bindings/bytes.c -+++ dbus-python-1.2.0/_dbus_bindings/bytes.c -@@ -138,23 +138,6 @@ bad_range: - return NULL; - } - --static PyObject * --Byte_tp_str(PyObject *self) --{ -- long i = NATIVEINT_ASLONG(self); -- unsigned char str[2] = { 0, 0 }; -- -- if (i == -1 && PyErr_Occurred()) -- return NULL; -- if (i < 0 || i > 255) { -- PyErr_SetString(PyExc_RuntimeError, "Integer outside range 0-255"); -- return NULL; -- } -- -- str[0] = (unsigned char)i; -- return PyUnicode_FromStringAndSize((char *)str, 1); --} -- - PyTypeObject DBusPyByte_Type = { - PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) - "dbus.Byte", -@@ -171,7 +154,7 @@ PyTypeObject DBusPyByte_Type = { - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ -- Byte_tp_str, /* tp_str */ -+ 0, /* tp_str */ - 0, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ diff --git a/meta-phosphor/common/recipes-devtools/python/python-dbus_%.bbappend b/meta-phosphor/common/recipes-devtools/python/python-dbus_%.bbappend deleted file mode 100644 index 57d5ef46e..000000000 --- a/meta-phosphor/common/recipes-devtools/python/python-dbus_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://bytes.patch" |
