From 2391776de345983a0a23ebba1f67e21c7674c25b Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Tue, 22 Mar 2022 16:07:34 -0700 Subject: [PATCH 1/2] make subprocess output a string instead of bytes, needed in python 3.7 --- openni2_launch/src/openni2_launch/wtf_plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openni2_launch/src/openni2_launch/wtf_plugin.py b/openni2_launch/src/openni2_launch/wtf_plugin.py index 7a7f579..69fda35 100644 --- a/openni2_launch/src/openni2_launch/wtf_plugin.py +++ b/openni2_launch/src/openni2_launch/wtf_plugin.py @@ -53,7 +53,7 @@ def _device_notfound_subproc(id_manufacturer, id_product): can be wiped out. See https://github.com/ros-drivers/openni2_camera/pull/80#discussion_r193295442 """ device_re = re.compile("Bus\s+(?P\d+)\s+Device\s+(?P\d+).+ID\s(?P\w+:\w+)\s(?P.+)$", re.I) - df = subprocess.check_output("lsusb") + df = subprocess.check_output("lsusb", text=True) devices = [] for i in df.split('\n'): if i: From 9ad6eb75cb3b229e283d920f5fb26ac5476bf08a Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Mon, 26 Dec 2022 09:05:48 -0800 Subject: [PATCH 2/2] use hpp instead of deprecated .h pluginlib headers --- openni2_camera/ros/openni2_camera_nodelet.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openni2_camera/ros/openni2_camera_nodelet.cpp b/openni2_camera/ros/openni2_camera_nodelet.cpp index 90f7075..b4e4918 100644 --- a/openni2_camera/ros/openni2_camera_nodelet.cpp +++ b/openni2_camera/ros/openni2_camera_nodelet.cpp @@ -53,5 +53,5 @@ class OpenNI2DriverNodelet : public nodelet::Nodelet } -#include +#include PLUGINLIB_EXPORT_CLASS(openni2_camera::OpenNI2DriverNodelet, nodelet::Nodelet)