Fix uobjnew and ustat on python3 #959
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fixes a TypeError in python 3, e.g, when executing uobjnew
Traceback (most recent call last):
File "./uobjnew", line 134, in <module>
bpf = BPF(text=program, usdt_contexts=[usdt])
File "/usr/lib/python3.5/site-packages/bcc/__init__.py", line 224, in __init__
text = usdt_text + text
TypeError: can't concat bytes to str
$ ./uobjnew
File "./uobjnew", line 150
data = sorted(data.items(), key=lambda (k, v): v.num_allocs)
^
SyntaxError: invalid syntax
$ ./ustat
File "./ustat", line 242
counts = sorted(counts.items(), key=lambda (_, v):
^
SyntaxError: invalid syntax
goldshtn
reviewed
Feb 13, 2017
| @@ -239,10 +239,10 @@ def _loop_iter(self): | |||
| counts.update(probe.get_counts(self.bpf)) | |||
| targets.update(probe.targets) | |||
| if self.args.sort: | |||
| counts = sorted(counts.items(), key=lambda (_, v): | |||
| counts = sorted(counts.items(), key=lambda _, v: | |||
There was a problem hiding this comment.
This is now broken on Python 2.x
goldshtn
reviewed
Feb 13, 2017
| data = data[-args.top_size:] | ||
| else: | ||
| data = sorted(data.items(), key=lambda (k, v): v.total_size) | ||
| data = sorted(data.items(), key=lambda k, v: v.total_size) |
There was a problem hiding this comment.
This is now broken on Python 2.x
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.