jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix construction from dict for std::multimap std::unordered_multimap (Python 3)

Browse source
This commit is contained in:
William S Fulton 2017-06-23 14:38:26 +01:00
commit 005ff93dbd
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/python/std_multimap.i
View file

@ -23,7 +23,11 @@
int res = SWIG_ERROR; int res = SWIG_ERROR;
if (PyDict_Check(obj)) { if (PyDict_Check(obj)) {
SwigVar_PyObject items = PyObject_CallMethod(obj,(char *)"items",NULL); SwigVar_PyObject items = PyObject_CallMethod(obj,(char *)"items",NULL);
return traits_asptr_stdseq<std::multimap<K,T>, std::pair<K, T> >::asptr(items, val); %#if PY_VERSION_HEX >= 0x03000000
/* In Python 3.x the ".items()" method returns a dict_items object */
items = PySequence_Fast(items, ".items() didn't return a sequence!");
%#endif
res = traits_asptr_stdseq<std::multimap<K,T>, std::pair<K, T> >::asptr(items, val);
} else { } else {
multimap_type *p; multimap_type *p;
swig_type_info *descriptor = swig::type_info<multimap_type>(); swig_type_info *descriptor = swig::type_info<multimap_type>();

6
Lib/python/std_unordered_multimap.i
View file

@ -30,7 +30,11 @@
int res = SWIG_ERROR; int res = SWIG_ERROR;
if (PyDict_Check(obj)) { if (PyDict_Check(obj)) {
SwigVar_PyObject items = PyObject_CallMethod(obj,(char *)"items",NULL); SwigVar_PyObject items = PyObject_CallMethod(obj,(char *)"items",NULL);
return traits_asptr_stdseq<std::unordered_multimap<K,T>, std::pair<K, T> >::asptr(items, val); %#if PY_VERSION_HEX >= 0x03000000
/* In Python 3.x the ".items()" method returns a dict_items object */
items = PySequence_Fast(items, ".items() didn't return a sequence!");
%#endif
res = traits_asptr_stdseq<std::unordered_multimap<K,T>, std::pair<K, T> >::asptr(items, val);
} else { } else {
unordered_multimap_type *p; unordered_multimap_type *p;
swig_type_info *descriptor = swig::type_info<unordered_multimap_type>(); swig_type_info *descriptor = swig::type_info<unordered_multimap_type>();