Skip to content

Commit

Permalink
Cosmetic
Browse files Browse the repository at this point in the history
  • Loading branch information
andresriancho committed Jul 16, 2018
1 parent fc54b97 commit 7b5e62a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,7 @@ def handle_exception(self, phase, plugin_name,
status.set_running_plugin(phase, plugin_name, log=False)
status.set_current_fuzzable_request(phase, fuzzable_request)

exception_data = ExceptionData(status, _exception, tb,
enabled_plugins)
exception_data = ExceptionData(status, _exception, tb, enabled_plugins)
self._out_queue.put(exception_data)

def add_observer(self, observer):
Expand Down
20 changes: 10 additions & 10 deletions w3af/core/controllers/core_helpers/status.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def __init__(self, w3af_core, scans_completed=0):
def pause(self, pause_yes_no):
self._paused = pause_yes_no
self._is_running = not pause_yes_no
om.out.debug('The user paused/unpaused the scan.')
om.out.debug('The user paused / unpaused the scan.')

def start(self):
self._is_running = True
Expand Down Expand Up @@ -461,17 +461,17 @@ def get_long_status(self):

status_str = '%(status)s\n'

status_str += 'Crawl phase: In (%(cin)s URLs/min)' \
' Out (%(cout)s URLs/min) Pending (%(clen)s URLs)' \
' ETA (%(ceta)s)\n'
status_str += ('Crawl phase: In (%(cin)s URLs/min)'
' Out (%(cout)s URLs/min) Pending (%(clen)s URLs)'
' ETA (%(ceta)s)\n')

status_str += 'Audit phase: In (%(ain)s URLs/min)' \
' Out (%(aout)s URLs/min) Pending (%(alen)s URLs)' \
' ETA (%(aeta)s)\n'
status_str += ('Audit phase: In (%(ain)s URLs/min)'
' Out (%(aout)s URLs/min) Pending (%(alen)s URLs)'
' ETA (%(aeta)s)\n')

status_str += 'Grep phase: In (%(gin)s URLs/min)'\
' Out (%(gout)s URLs/min) Pending (%(glen)s URLs)' \
' ETA (%(geta)s)\n'
status_str += ('Grep phase: In (%(gin)s URLs/min)'
' Out (%(gout)s URLs/min) Pending (%(glen)s URLs)'
' ETA (%(geta)s)\n')

status_str += 'Requests per minute: %(rpm)s'

Expand Down
1 change: 1 addition & 0 deletions w3af/core/data/url/opener_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ def set_cookie_jar_file(self, cookiejar_file):
return

cj = cookielib.MozillaCookieJar()

try:
cj.load(cookiejar_file)
except cookielib.LoadError, cle:
Expand Down

0 comments on commit 7b5e62a

Please sign in to comment.