diff options
| author | Alexander Pyhalov <apyhalov@gmail.com> | 2020-01-14 21:23:25 +0300 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2020-01-15 15:23:30 -0500 |
| commit | b0858fdc3790ef1d1f955bd584621c6fd539050d (patch) | |
| tree | 65d9745af0d5ab456750a0d9fc2493ebd205523c /usr/src/lib/pyzfs | |
| parent | e25cb0e77ab84d3147918b8aef1f5161fbccb30e (diff) | |
| download | illumos-joyent-b0858fdc3790ef1d1f955bd584621c6fd539050d.tar.gz | |
11522 illumos-gate has some runtime dependencies on Python 2.7
12192 python3 modules treat strings incorrectly
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
Reviewed by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/lib/pyzfs')
| -rw-r--r-- | usr/src/lib/pyzfs/common/ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/lib/pyzfs/common/ioctl.c b/usr/src/lib/pyzfs/common/ioctl.c index 55c03fc2b8..a931a7bb69 100644 --- a/usr/src/lib/pyzfs/common/ioctl.c +++ b/usr/src/lib/pyzfs/common/ioctl.c @@ -144,7 +144,7 @@ dict2nvl(PyObject *d) while (PyDict_Next(d, &pos, &key, &value)) { #if PY_MAJOR_VERSION >= 3 - char *keystr = PyBytes_AsString(key); + char *keystr = PyUnicode_AsUTF8(key); #else char *keystr = PyString_AsString(key); #endif @@ -161,12 +161,12 @@ dict2nvl(PyObject *d) } else if (value == Py_None) { err = nvlist_add_boolean(nvl, keystr); #if PY_MAJOR_VERSION >= 3 - } else if (PyBytes_Check(value)) { + } else if (PyUnicode_Check(value)) { #else } else if (PyString_Check(value)) { #endif #if PY_MAJOR_VERSION >= 3 - char *valstr = PyBytes_AsString(value); + char *valstr = PyUnicode_AsUTF8(value); #else char *valstr = PyString_AsString(value); #endif |