nhyatt/osslsigncode
1
0
Fork 0
mirror of https://github.com/mtrojnar/osslsigncode.git synced 2025-05-20 10:24:29 -05:00
Code Issues Projects Releases Wiki Activity

tests: fixed string formatting in Python version earlier than 2.6

Browse Source
This commit is contained in:
olszomal 2023-11-22 09:26:31 +01:00 committed by Michał Trojnara
parent 7b60d6447d
commit c909ba82d7
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/server_http.py
View File

@ -53,7 +53,7 @@ class RequestHandler(SimpleHTTPRequestHandler):
resp_data = file.read() resp_data = file.read()
self.wfile.write(resp_data) self.wfile.write(resp_data)
except Exception as err: # pylint: disable=broad-except except Exception as err: # pylint: disable=broad-except
print(f"HTTP GET request error: {err}") print("HTTP GET request error: {}".format(err))
def do_POST(self): # pylint: disable=invalid-name def do_POST(self): # pylint: disable=invalid-name
@ -83,7 +83,7 @@ class RequestHandler(SimpleHTTPRequestHandler):
resp_data = file.read() resp_data = file.read()
self.wfile.write(resp_data) self.wfile.write(resp_data)
except Exception as err: # pylint: disable=broad-except except Exception as err: # pylint: disable=broad-except
print(f"HTTP POST request error: {err}") print("HTTP POST request error: {}".format(err))
class HttpServerThread(): class HttpServerThread():
@ -100,7 +100,7 @@ class HttpServerThread():
self.server_thread = threading.Thread(target=self.server.serve_forever) self.server_thread = threading.Thread(target=self.server.serve_forever)
self.server_thread.start() self.server_thread.start()
hostname, port = self.server.server_address[:2] hostname, port = self.server.server_address[:2]
print(f"HTTP server started, URL http://{hostname}:{port}") print("HTTP server started, URL http://{}:{}".format(hostname, port))
return port return port
@ -121,7 +121,7 @@ def main() -> None:
with open(PORT_LOG, mode="w") as file: with open(PORT_LOG, mode="w") as file:
file.write("{}".format(port)) file.write("{}".format(port))
except OSError as err: except OSError as err:
print(f"OSError: {err}") print("OSError: {}".format(err))
ret = err.errno ret = err.errno
finally: finally:
sys.exit(ret) sys.exit(ret)
@ -133,7 +133,7 @@ if __name__ == '__main__':
if fpid > 0: if fpid > 0:
sys.exit(0) sys.exit(0)
except OSError as ferr: except OSError as ferr:
print(f"Fork #1 failed: {ferr.errno} {ferr.strerror}") print("Fork #1 failed: {} {}".format(ferr.errno, ferr.strerror))
sys.exit(1) sys.exit(1)
try: try:
@ -141,7 +141,7 @@ if __name__ == '__main__':
if fpid > 0: if fpid > 0:
sys.exit(0) sys.exit(0)
except OSError as ferr: except OSError as ferr:
print(f"Fork #2 failed: {ferr.errno} {ferr.strerror}") print("Fork #2 failed: {} {}".format(ferr.errno, ferr.strerror))
sys.exit(1) sys.exit(1)
# Start the daemon main loop # Start the daemon main loop

8
tests/server_http.pyw
View File

@ -53,7 +53,7 @@ class RequestHandler(SimpleHTTPRequestHandler):
resp_data = file.read() resp_data = file.read()
self.wfile.write(resp_data) self.wfile.write(resp_data)
except Exception as err: # pylint: disable=broad-except except Exception as err: # pylint: disable=broad-except
print(f"HTTP GET request error: {err}") print("HTTP GET request error: {}".format(err))
def do_POST(self): # pylint: disable=invalid-name def do_POST(self): # pylint: disable=invalid-name
@ -83,7 +83,7 @@ class RequestHandler(SimpleHTTPRequestHandler):
resp_data = file.read() resp_data = file.read()
self.wfile.write(resp_data) self.wfile.write(resp_data)
except Exception as err: # pylint: disable=broad-except except Exception as err: # pylint: disable=broad-except
print(f"HTTP POST request error: {err}") print("HTTP POST request error: {}".format(err))
class HttpServerThread(): class HttpServerThread():
@ -100,7 +100,7 @@ class HttpServerThread():
self.server_thread = threading.Thread(target=self.server.serve_forever) self.server_thread = threading.Thread(target=self.server.serve_forever)
self.server_thread.start() self.server_thread.start()
hostname, port = self.server.server_address[:2] hostname, port = self.server.server_address[:2]
print(f"HTTP server started, URL http://{hostname}:{port}") print("HTTP server started, URL http://{}:{}".format(hostname, port))
return port return port
@ -115,7 +115,7 @@ def main() -> None:
with open(PORT_LOG, mode="w") as file: with open(PORT_LOG, mode="w") as file:
file.write("{}".format(port)) file.write("{}".format(port))
except OSError as err: except OSError as err:
print(f"OSError: {err}") print("OSError: {}".format(err))
ret = err.errno ret = err.errno
finally: finally:
sys.exit(ret) sys.exit(ret)