Skip to content

fix: resolve circular import and None hostname crash in monitor #176

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
moonsterr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: resolve circular import and None hostname crash in monitor #176

Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions evillimiter/console/io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import re
import colorama

from . import shell


class IO(object):
_ANSI_CSI_RE = re.compile('\001?\033\\[((?:\\d|;)*)([a-zA-Z])\002?')
Expand Down Expand Up @@ -68,6 +66,7 @@ def clear():
"""
Clears the terminal screen
"""
from evillimiter.console import shell
shell.execute('clear')

@staticmethod
Expand Down
4 changes: 2 additions & 2 deletions evillimiter/menus/main_menu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,10 +244,10 @@ def _add_handler(self, args):
IO.error('unable to resolve mac address. specify manually (--mac).')
return

name = None
name = ''
try:
host_info = socket.gethostbyaddr(ip)
name = None if host_info is None else host_info[0]
name = host_info[0]
except socket.herror:
pass

Expand Down