Some spring cleaning.

This commit is contained in:
grossmj
2018-03-15 14:17:40 +07:00
parent 3e0242ada7
commit d4a0b21206
5 changed files with 9 additions and 9 deletions

View File

@@ -632,7 +632,7 @@ class HTTPClient(QtCore.QObject):
def _requestCanceled(self, response, context):
if response.isRunning() and not response.error() != QtNetwork.QNetworkReply.NoError:
log.warn("Aborting request for {}".format(response.url().toString()))
log.warning("Aborting request for {}".format(response.url().toString()))
response.abort()
if "query_id" in context:
self._notify_progress_end_query(context["query_id"])
@@ -753,7 +753,7 @@ class HTTPClient(QtCore.QObject):
else:
return response.status, None
except http.client.InvalidURL as e:
log.warn("Invalid local server url: {}".format(e))
log.warning("Invalid local server url: {}".format(e))
return 0, None
except urllib.error.URLError:
# Connection refused. It's a normal behavior if server is not started

View File

@@ -375,7 +375,7 @@ class LocalServer(QtCore.QObject):
# check the local server path
local_server_path = self.localServerPath()
if not local_server_path:
log.warn("No local server is configured")
log.warning("No local server is configured")
return False
if not os.path.isfile(local_server_path):
QtWidgets.QMessageBox.critical(self.parent(), "Local server", "Could not find local server {}".format(local_server_path))
@@ -462,7 +462,7 @@ class LocalServer(QtCore.QObject):
except FileNotFoundError:
pass
except OSError as e:
log.warn("could not delete server log file {}: {}".format(logpath, e))
log.warning("could not delete server log file {}: {}".format(logpath, e))
command += ' --log="{}" --pid="{}"'.format(logpath, self._pid_path())
log.debug("Starting local server process with {}".format(command))

View File

@@ -121,7 +121,7 @@ def init_logger(level, logfile, quiet=False):
handler.formatter = logging.Formatter("{asctime} {levelname} {filename}:{lineno} {message}", "%Y-%m-%d %H:%M:%S", "{")
log.addHandler(handler)
except OSError as e:
log.warn("could not log to {}: {}".format(logfile, e))
log.warning("could not log to {}: {}".format(logfile, e))
log.info('Log level: {}'.format(logging.getLevelName(level)))

View File

@@ -90,13 +90,13 @@ def locale_check():
log.error("could not determine the current locale: {}".format(e))
if not language and not encoding:
try:
log.warn("could not find a default locale, switching to C.UTF-8...")
log.warning("could not find a default locale, switching to C.UTF-8...")
locale.setlocale(locale.LC_ALL, ("C", "UTF-8"))
except locale.Error as e:
log.error("could not switch to the C.UTF-8 locale: {}".format(e))
raise SystemExit
elif encoding != "UTF-8":
log.warn("your locale {}.{} encoding is not UTF-8, switching to the UTF-8 version...".format(language, encoding))
log.warning("your locale {}.{} encoding is not UTF-8, switching to the UTF-8 version...".format(language, encoding))
try:
locale.setlocale(locale.LC_ALL, (language, "UTF-8"))
except locale.Error as e:

View File

@@ -58,10 +58,10 @@ def getSynchronous(protocol, host, port, endpoint, timeout=2, user=None, passwor
else:
return response.status, None
except http.client.InvalidURL as e:
log.warn("Invalid local server url: {}".format(e))
log.warning("Invalid local server url: {}".format(e))
return 0, None
except http.client.UnknownProtocol:
log.warn("Unknown server running on {}:{}".format(host, port))
log.warning("Unknown server running on {}:{}".format(host, port))
return 0, None
except urllib.error.URLError:
# Connection refused. It's a normal behavior if server is not started