Trivial updates

This commit is contained in:
Miroslav Stampar 2019-12-09 22:13:52 +01:00
parent 38d5086b88
commit 1a95cea1f2
6 changed files with 11 additions and 9 deletions

View File

@ -27,7 +27,7 @@ def profile(profileOutputFile=None, dotOutputFile=None, imageOutputFile=None):
import pydot import pydot
except ImportError as ex: except ImportError as ex:
errMsg = "profiling requires third-party libraries ('%s') " % getSafeExString(ex) errMsg = "profiling requires third-party libraries ('%s') " % getSafeExString(ex)
errMsg += "(Hint: 'sudo apt-get install python-pydot python-pyparsing python-profiler graphviz')" errMsg += "(Hint: 'sudo apt install python-pydot python-pyparsing python-profiler graphviz')"
logger.error(errMsg) logger.error(errMsg)
return return
@ -84,7 +84,7 @@ def profile(profileOutputFile=None, dotOutputFile=None, imageOutputFile=None):
pydotGraph.write_png(imageOutputFile) pydotGraph.write_png(imageOutputFile)
except OSError: except OSError:
errMsg = "profiling requires graphviz installed " errMsg = "profiling requires graphviz installed "
errMsg += "(Hint: 'sudo apt-get install graphviz')" errMsg += "(Hint: 'sudo apt install graphviz')"
logger.error(errMsg) logger.error(errMsg)
else: else:
infoMsg = "displaying interactive graph with xdot library" infoMsg = "displaying interactive graph with xdot library"

View File

@ -136,6 +136,6 @@ def update():
infoMsg += "https://github.com/sqlmapproject/sqlmap/downloads" infoMsg += "https://github.com/sqlmapproject/sqlmap/downloads"
else: else:
infoMsg = "for Linux platform it's recommended " infoMsg = "for Linux platform it's recommended "
infoMsg += "to install a standard 'git' package (e.g.: 'sudo apt-get install git')" infoMsg += "to install a standard 'git' package (e.g.: 'sudo apt install git')"
logger.info(infoMsg) logger.info(infoMsg)

View File

@ -705,7 +705,7 @@ def server(host=RESTAPI_DEFAULT_ADDRESS, port=RESTAPI_DEFAULT_PORT, adapter=REST
errMsg += "List of supported adapters: %s" % ', '.join(sorted(list(server_names.keys()))) errMsg += "List of supported adapters: %s" % ', '.join(sorted(list(server_names.keys())))
else: else:
errMsg = "Server support for adapter '%s' is not installed on this system " % adapter errMsg = "Server support for adapter '%s' is not installed on this system " % adapter
errMsg += "(Note: you can try to install it with 'sudo apt-get install python-%s' or 'sudo pip install %s')" % (adapter, adapter) errMsg += "(Note: you can try to install it with 'sudo apt install python-%s' or 'sudo pip install %s')" % (adapter, adapter)
logger.critical(errMsg) logger.critical(errMsg)
def _client(url, options=None): def _client(url, options=None):

View File

@ -107,9 +107,11 @@ from __future__ import print_function
try: try:
from thirdparty.six.moves import http_client as _http_client from thirdparty.six.moves import http_client as _http_client
from thirdparty.six.moves import range as _range
from thirdparty.six.moves import urllib as _urllib from thirdparty.six.moves import urllib as _urllib
except ImportError: except ImportError:
from six.moves import http_client as _http_client from six.moves import http_client as _http_client
from six.moves import range as _range
from six.moves import urllib as _urllib from six.moves import urllib as _urllib
import socket import socket
@ -569,7 +571,7 @@ def fetch(N, url, delay=0):
import time import time
lens = [] lens = []
starttime = time.time() starttime = time.time()
for i in range(N): for i in _range(N):
if delay and i > 0: time.sleep(delay) if delay and i > 0: time.sleep(delay)
fo = _urllib.request.urlopen(url) fo = _urllib.request.urlopen(url)
foo = fo.read() foo = fo.read()