boost/histogram
2
0
Fork 0
mirror of https://github.com/boostorg/histogram.git synced 2026-01-30 07:52:11 +00:00
Code Issues Projects Releases Wiki Activity

fixed py3 bugs

Browse Source
This commit is contained in:
Hans Dembinski
2018-07-04 00:22:48 +02:00
parent 1791c7aa68
commit e119bf0601
5 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/python/axis.cpp
View File

@@ -9,7 +9,7 @@
#include <boost/histogram/axis/axis.hpp>
#include <boost/histogram/axis/any.hpp>
#include <boost/histogram/axis/ostream_operators.hpp>
#include <boost/math/constants/constants.hpp>
#include <boost/histogram/detail/utility.hpp>
#include <boost/python.hpp>
#include <boost/python/def_visitor.hpp>
#include <boost/python/raw_function.hpp>
@@ -89,7 +89,8 @@ bp::object variable_init(bp::tuple args, bp::dict kwargs) {
auto uo = bha::uoflow::on;
while (bp::len(kwargs) > 0) {
bp::tuple kv = kwargs.popitem();
boost::string_view k(bp::extract<const char*>(kv[0]), bp::len(kv[0]));
const char* key_cstr = bp::extract<const char*>(kv[0]);
boost::string_view k(key_cstr, bp::len(kv[0]));
bp::object v = kv[1];
if (k == "label")
label = boost::string_view(bp::extract<const char*>(v), bp::len(v));
@@ -120,7 +121,8 @@ bp::object category_init(bp::tuple args, bp::dict kwargs) {
boost::string_view label;
while (bp::len(kwargs) > 0) {
bp::tuple kv = kwargs.popitem();
boost::string_view k(bp::extract<const char*>(kv[0]), bp::len(kv[0]));
const char* key_cstr = bp::extract<const char*>(kv[0]);
boost::string_view k(key_cstr, bp::len(kv[0]));
bp::object v = kv[1];
if (k == "label")
label = boost::string_view(bp::extract<const char*>(v), bp::len(v));
@@ -270,7 +272,9 @@ void register_axis_types() {
class_<generic_iterator>("generic_iterator", init<object>())
.def("__iter__", &generic_iterator::self)
.def("next", &generic_iterator::next);
.def("__next__", &generic_iterator::next) // Python3
.def("next", &generic_iterator::next) // Python2
;
class_<bha::regular<>>(
"regular",
@@ -319,7 +323,7 @@ void register_axis_types() {
no_init)
.def(init<unsigned, double, double, const char*>(
(arg("self"), arg("bin"), arg("phase") = 0.0,
arg("perimeter") = boost::math::double_constants::two_pi,
arg("perimeter") = bh::detail::two_pi,
arg("label") = "")))
.def(axis_suite<bha::circular<>>());