Skip to content

In threading replace getName() by name due DeprecationWarning #118

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

In threading replace getName() by name due DeprecationWarning #118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions bin/pwncat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4207,19 +4207,19 @@ class Runner(object):
"Call INTERRUPT: %s.%s() for %s",
getattr(interrupt, "__self__").__class__.__name__,
interrupt.__name__,
self.__threads[key].getName(),
self.__threads[key].name,
)
interrupt()
# [2/3] All blocking events inside the threads are gone, now join them
try:
self.log.trace( # type: ignore
"Joining %s", self.__threads[key].getName()
"Joining %s", self.__threads[key].name
)
# NOTE: The thread.join() operating will also block the signal
# handler if we try to join too many threads at once.
self.__threads[key].join()
self.log.trace( # type: ignore
"Joined %s", self.__threads[key].getName()
"Joined %s", self.__threads[key].name
)
except RuntimeError:
pass
Expand Down