mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-29 19:56:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

[3.6] bpo-12239: Make GetProperty() return None for VT_EMPTY (GH-4539)

Browse source 
The previous behavior was to raise an exception

    NotImplementedError: result of type 0

when the value of the property is VT_EMPTY.

(cherry picked from commit 19fb134185)
This commit is contained in:
Berker Peksag 2017-11-24 19:04:40 +03:00 • committed by GitHub
parent bfa89b21e1
commit 412f00b839
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/test/test_msilib.py
View file

@ -52,6 +52,13 @@ class MsiDatabaseTestCase(unittest.TestCase):
msilib.OpenDatabase(db_path, msilib.MSIDBOPEN_CREATE) msilib.OpenDatabase(db_path, msilib.MSIDBOPEN_CREATE)
self.assertEqual(str(cm.exception), 'create failed') self.assertEqual(str(cm.exception), 'create failed')
def test_get_property_vt_empty(self):
db, db_path = init_database()
summary = db.GetSummaryInformation(0)
self.assertIsNone(summary.GetProperty(msilib.PID_SECURITY))
del db
self.addCleanup(unlink, db_path)
class Test_make_id(unittest.TestCase): class Test_make_id(unittest.TestCase):
#http://msdn.microsoft.com/en-us/library/aa369212(v=vs.85).aspx #http://msdn.microsoft.com/en-us/library/aa369212(v=vs.85).aspx

2
Misc/NEWS.d/next/Library/2017-11-24-14-07-55.bpo-12239.Nj3A0x.rst Normal file
View file

@ -0,0 +1,2 @@
Make :meth:`msilib.SummaryInformation.GetProperty` return ``None`` when the
value of property is ``VT_EMPTY``. Initial patch by Mark Mc Mahon.

2
PC/_msi.c
View file

@ -578,6 +578,8 @@ summary_getproperty(msiobj* si, PyObject *args)
if (sval != sbuf) if (sval != sbuf)
free(sval); free(sval);
return result; return result;
case VT_EMPTY:
Py_RETURN_NONE;
} }
PyErr_Format(PyExc_NotImplementedError, "result of type %d", type); PyErr_Format(PyExc_NotImplementedError, "result of type %d", type);
return NULL; return NULL;