Merge pull request #113 from lucasw/subprocess_wtf_python3_7

make subprocess output a string instead of bytes, needed in python 3.7
ros-drivers · Oct 25, 2023 · 2282d9b · 2282d9b
2 parents a5ce3b2 + 9ad6eb7
commit 2282d9b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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 <pluginlib/class_list_macros.h>
+#include <pluginlib/class_list_macros.hpp>
 PLUGINLIB_EXPORT_CLASS(openni2_camera::OpenNI2DriverNodelet, nodelet::Nodelet)
diff --git 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<bus>\d+)\s+Device\s+(?P<device>\d+).+ID\s(?P<id>\w+:\w+)\s(?P<tag>.+)$", re.I)
-    df = subprocess.check_output("lsusb")
+    df = subprocess.check_output("lsusb", text=True)
     devices = []
     for i in df.split('\n'):
         if i: