diff --git a/src/wxpybuffer.h b/src/wxpybuffer.h index 80d5e5ca..501ca9bc 100644 --- a/src/wxpybuffer.h +++ b/src/wxpybuffer.h @@ -31,8 +31,9 @@ public: #if PY_MAJOR_VERSION < 3 // Old buffer protocol int rv = PyObject_AsReadBuffer(obj, (const void**)&m_ptr, &m_len); - return rv != -1; - #else + if (rv != -1) + return true; + #endif // New buffer protocol Py_buffer view; if (PyObject_GetBuffer(obj, &view, PyBUF_SIMPLE) != 0) @@ -41,7 +42,6 @@ public: m_len = view.len; PyBuffer_Release(&view); return true; - #endif } diff --git a/wx/tools/pywxrc.py b/wx/tools/pywxrc.py index 649c0e7c..32c1c8a6 100644 --- a/wx/tools/pywxrc.py +++ b/wx/tools/pywxrc.py @@ -226,7 +226,7 @@ def __init_resources(): """ ADD_FILE_TO_MEMFS = """\ - wx.MemoryFSHandler.AddFile('XRC/%(memoryPath)s/%(filename)s', bytearray(%(filename)s)) + wx.MemoryFSHandler.AddFile('XRC/%(memoryPath)s/%(filename)s', memoryview(%(filename)s)) """ LOAD_RES_MEMFS = """\