diff options
| author | David Shah <dave@ds0.me> | 2020-04-24 19:01:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-24 19:01:04 +0100 |
| commit | 5c6b2cbafef7435bd697cedf30436bf16e70dc15 (patch) | |
| tree | 7fd3e809e960079aeacd66ae8a8fcfa37203e4c3 /common | |
| parent | 5e40589114c1a61825d3772165f457895fc9acd0 (diff) | |
| parent | 25938500d6d0fbcd6e14d7d5ff3e45275ead6bb7 (diff) | |
| download | nextpnr-5c6b2cbafef7435bd697cedf30436bf16e70dc15.tar.gz nextpnr-5c6b2cbafef7435bd697cedf30436bf16e70dc15.tar.bz2 nextpnr-5c6b2cbafef7435bd697cedf30436bf16e70dc15.zip | |
Merge pull request #433 from YosysHQ/dave/pyfixes
python: Miscellaneous fixes
Diffstat (limited to 'common')
| -rw-r--r-- | common/pycontainers.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/common/pycontainers.h b/common/pycontainers.h index 04c670cc..2b9ee208 100644 --- a/common/pycontainers.h +++ b/common/pycontainers.h @@ -285,7 +285,9 @@ template <typename T1, typename T2, typename value_conv> struct map_pair_wrapper { if ((i >= 2) || (i < 0)) KeyError(); - return (i == 1) ? object(value_conv()(x.ctx, x.base.second)) : object(x.base.first); + return (i == 1) ? object(value_conv()(x.ctx, x.base.second)) + : object(PythonConversion::string_converter<decltype(x.base.first)>().to_str(x.ctx, + x.base.first)); } static int len(wrapped_pair &x) { return 2; } @@ -410,7 +412,8 @@ template <typename T1, typename T2> struct map_pair_wrapper_uptr if ((i >= 2) || (i < 0)) KeyError(); return (i == 1) ? object(PythonConversion::ContextualWrapper<V &>(x.ctx, *x.base.second.get())) - : object(x.base.first); + : object(PythonConversion::string_converter<decltype(x.base.first)>().to_str(x.ctx, + x.base.first)); } static int len(wrapped_pair &x) { return 2; } |