[pre-commit.ci] pre-commit autoupdate (#503)

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v3.15.2
     hooks:
       - id: pyupgrade
         args: [--py38-plus]
   - repo: https://github.com/psf/black
-    rev: 23.12.1
+    rev: 24.3.0
     hooks:
       - id: black
         language_version: python3
@@ -14,7 +14,7 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.1.0
+    rev: 7.0.0
     hooks:
       - id: flake8
         additional_dependencies:

daphne/cli.py

@@ -270,16 +270,16 @@ class CommandLineInterface:
             websocket_connect_timeout=args.websocket_connect_timeout,
             websocket_handshake_timeout=args.websocket_connect_timeout,
             application_close_timeout=args.application_close_timeout,
-            action_logger=AccessLogGenerator(access_log_stream)
+            action_logger=(
-            if access_log_stream
+                AccessLogGenerator(access_log_stream) if access_log_stream else None
-            else None,
+            ),
             root_path=args.root_path,
             verbosity=args.verbosity,
             proxy_forwarded_address_header=self._get_forwarded_host(args=args),
             proxy_forwarded_port_header=self._get_forwarded_port(args=args),
-            proxy_forwarded_proto_header="X-Forwarded-Proto"
+            proxy_forwarded_proto_header=(
-            if args.proxy_headers
+                "X-Forwarded-Proto" if args.proxy_headers else None
-            else None,
+            ),
             server_name=args.server_name,
         )
         self.server.run()

daphne/http_protocol.py

@@ -286,9 +286,11 @@ class WebRequest(http.Request):
                             "path": uri,
                             "status": self.code,
                             "method": self.method.decode("ascii", "replace"),
-                            "client": "%s:%s" % tuple(self.client_addr)
+                            "client": (
-                            if self.client_addr
+                                "%s:%s" % tuple(self.client_addr)
-                            else None,
+                                if self.client_addr
+                                else None
+                            ),
                             "time_taken": self.duration(),
                             "size": self.sentLength,
                         },

daphne/ws_protocol.py

@@ -115,9 +115,9 @@ class WebSocketProtocol(WebSocketServerProtocol):
             "connecting",
             {
                 "path": self.request.path,
-                "client": "%s:%s" % tuple(self.client_addr)
+                "client": (
-                if self.client_addr
+                    "%s:%s" % tuple(self.client_addr) if self.client_addr else None
-                else None,
+                ),
             },
         )
 
@@ -138,9 +138,9 @@ class WebSocketProtocol(WebSocketServerProtocol):
             "connected",
             {
                 "path": self.request.path,
-                "client": "%s:%s" % tuple(self.client_addr)
+                "client": (
-                if self.client_addr
+                    "%s:%s" % tuple(self.client_addr) if self.client_addr else None
-                else None,
+                ),
             },
         )
 
@@ -175,9 +175,9 @@ class WebSocketProtocol(WebSocketServerProtocol):
             "disconnected",
             {
                 "path": self.request.path,
-                "client": "%s:%s" % tuple(self.client_addr)
+                "client": (
-                if self.client_addr
+                    "%s:%s" % tuple(self.client_addr) if self.client_addr else None
-                else None,
+                ),
             },
         )
 
@@ -242,9 +242,9 @@ class WebSocketProtocol(WebSocketServerProtocol):
             "rejected",
             {
                 "path": self.request.path,
-                "client": "%s:%s" % tuple(self.client_addr)
+                "client": (
-                if self.client_addr
+                    "%s:%s" % tuple(self.client_addr) if self.client_addr else None
-                else None,
+                ),
             },
         )