From 8003d43e45a4376e6c4749ce2b948f19eeee87f0 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Thu, 18 Jun 2026 15:42:29 +0200 Subject: workflows/ci: use default Black settings --- .github/workflows/ci.yml | 4 ---- src/app.py | 28 ++++++++++++++-------------- src/server.py | 36 ++++++++++++++++++------------------ 3 files changed, 32 insertions(+), 36 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39e3e94..0db3f40 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,10 +17,6 @@ jobs: python-version: '3.x' - name: Run black uses: psf/black@stable - with: - # > Please note that the --check flag is required so that the - # > workflow fails if Black finds files that need to be formatted. - options: --check --verbose --skip-string-normalization test: strategy: diff --git a/src/app.py b/src/app.py index 1655e00..92cf249 100755 --- a/src/app.py +++ b/src/app.py @@ -24,19 +24,19 @@ class Response: self.body = body def headers(self): - yield 'Content-Type', 'text/html; charset=utf-8' + yield "Content-Type", "text/html; charset=utf-8" def encode_body(self): - return self.body.encode(errors='replace') + return self.body.encode(errors="replace") def write_as_cgi_script(self): self.write_headers_as_cgi_script() self.write_body_as_cgi_script() def write_headers_as_cgi_script(self): - print(f'{self.status.value} {self.status.phrase}') + print(f"{self.status.value} {self.status.phrase}") for name, val in self.headers(): - print(f'{name}: {val}') + print(f"{name}: {val}") print() def write_body_as_cgi_script(self): @@ -88,11 +88,11 @@ class Void: self.cnt = cnt def save(self, path): - with open(path, 'w', encoding='utf-8') as fd: + with open(path, "w", encoding="utf-8") as fd: self.write(fd) def restore(self, path): - with open(path, encoding='utf-8') as fd: + with open(path, encoding="utf-8") as fd: self.read(fd) def scream_once(self): @@ -108,16 +108,16 @@ class Void: class Request(Enum): - SCREAM_ONCE = 'scream' - HOW_MANY_SCREAMS = 'screams' + SCREAM_ONCE = "scream" + HOW_MANY_SCREAMS = "screams" def __str__(self): return self.value @staticmethod def from_http_path(path): - if not path or path[0] != '/': - raise ValueError('HTTP path must start with a forward slash /') + if not path or path[0] != "/": + raise ValueError("HTTP path must start with a forward slash /") return Request(path[1:]) def process(self, void): @@ -125,12 +125,12 @@ class Request(Enum): return void.scream_once() if self is Request.HOW_MANY_SCREAMS: return void.get_numof_screams() - raise NotImplementedError(f'unknown request: {self}') + raise NotImplementedError(f"unknown request: {self}") def process_cgi_request(void): params = cgi.FieldStorage() - what = params['what'].value + what = params["what"].value Request(what).process(void).write_as_cgi_script() @@ -139,7 +139,7 @@ def parse_args(args=None): args = sys.argv[1:] parser = argparse.ArgumentParser() parser.add_argument( - '-v', '--void', metavar='PATH', dest='backup', help='set path to the void' + "-v", "--void", metavar="PATH", dest="backup", help="set path to the void" ) return parser.parse_args(args) @@ -150,5 +150,5 @@ def main(args=None): process_cgi_request(void) -if __name__ == '__main__': +if __name__ == "__main__": main() diff --git a/src/server.py b/src/server.py index 0328d55..c1c41f0 100755 --- a/src/server.py +++ b/src/server.py @@ -25,7 +25,7 @@ def script_dir(): def default_html_dir(): - return os.path.join(script_dir(), 'html') + return os.path.join(script_dir(), "html") def set_exiting(): @@ -58,12 +58,12 @@ class SignalHandler: def handle_sigterm(signum, frame): - print('\nSIGTERM received, exiting...') + print("\nSIGTERM received, exiting...") set_exiting() def handle_sigint(): - print('\nKeyboard interrupt received, exiting...') + print("\nKeyboard interrupt received, exiting...") set_exiting() @@ -80,10 +80,10 @@ class RequestHandler(http.server.SimpleHTTPRequestHandler): VOID = None def address_string(self): - if 'x-forwarded-for' in self.headers: - return self.headers['x-forwarded-for'].split(',')[0].strip() - if 'x-real-ip' in self.headers: - return self.headers['x-real-ip'] + if "x-forwarded-for" in self.headers: + return self.headers["x-forwarded-for"].split(",")[0].strip() + if "x-real-ip" in self.headers: + return self.headers["x-real-ip"] return super().address_string() def do_GET(self): @@ -102,7 +102,7 @@ class RequestHandler(http.server.SimpleHTTPRequestHandler): def make_server(port): - addr = ('', port) + addr = ("", port) server = http.server.HTTPServer if sys.version_info >= (3, 7): server = http.server.ThreadingHTTPServer @@ -114,22 +114,22 @@ def parse_args(args=None): args = sys.argv[1:] parser = argparse.ArgumentParser() parser.add_argument( - '-p', - '--port', - metavar='PORT', + "-p", + "--port", + metavar="PORT", type=int, default=DEFAULT_PORT, - help='set port number', + help="set port number", ) parser.add_argument( - '-d', - '--dir', - metavar='DIR', + "-d", + "--dir", + metavar="DIR", default=default_html_dir(), - help='HTML directory path', + help="HTML directory path", ) parser.add_argument( - '-v', '--void', metavar='PATH', dest='backup', help='set path to the void' + "-v", "--void", metavar="PATH", dest="backup", help="set path to the void" ) return parser.parse_args(args) @@ -151,5 +151,5 @@ def main(args=None): handle_sigint() -if __name__ == '__main__': +if __name__ == "__main__": main() -- cgit v1.3