Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix rosbag API for Python 3 #1048

Closed
wants to merge 3 commits into from
Closed

Fix rosbag API for Python 3 #1048

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e96839
Fix rosbag API for Python 3
May 8, 2017
acee48f
Fix rosbag API for Python 3
Aug 22, 2017
41dc18d
Merge pull request #1 from Shevonar/nstiurca/fix-rosbag-python3
nstiurca Aug 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tools/rosbag/src/rosbag/bag.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1580,6 +1580,7 @@ def _read_uint32(f): return _unpack_uint32(f.read(4))
def _read_uint64(f): return _unpack_uint64(f.read(8))
def _read_time (f): return _unpack_time (f.read(8))

def _decode_str(v): return v if type(v) is str else v.decode()
def _unpack_uint8(v): return struct.unpack('<B', v)[0]
def _unpack_uint32(v): return struct.unpack('<L', v)[0]
def _unpack_uint64(v): return struct.unpack('<Q', v)[0]
Expand Down Expand Up @@ -1628,8 +1629,7 @@ def _read_field(header, field, unpack_fn):

return value

def _read_str_field (header, field):
return _read_field(header, field, lambda v: v)
def _read_str_field (header, field): return _read_field(header, field, _decode_str)
def _read_uint8_field (header, field): return _read_field(header, field, _unpack_uint8)
def _read_uint32_field(header, field): return _read_field(header, field, _unpack_uint32)
def _read_uint64_field(header, field): return _read_field(header, field, _unpack_uint64)
Expand Down