From d07483c17bf31d416de3642a2faec484ea1810ed Mon Sep 17 00:00:00 2001 From: Zuckerberg Date: Sun, 1 Mar 2026 11:48:40 -0800 Subject: [PATCH] Update to python3 and fix ssl.wrap_socket removal in 3.12 --- flake.nix | 6 +++--- src/irc/irc.py | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 4c0e273..9dbdf2e 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ supportedSystems = with flake-utils.lib.system; [ x86_64-linux i686-linux aarch64-linux ]; in { overlay = final: prev: { - drastikbot = prev.python311.pkgs.buildPythonApplication rec { + drastikbot = prev.python3.pkgs.buildPythonApplication rec { pname = "drastikbot"; version = "v2.1"; @@ -29,8 +29,8 @@ cp -r $src/src/* $out mkdir -p $out/bin - makeWrapper ${prev.python311}/bin/python3 $out/bin/drastikbot \ - --prefix PYTHONPATH : ${with prev.python311.pkgs; makePythonPath [requests beautifulsoup4]} \ + makeWrapper ${prev.python3}/bin/python3 $out/bin/drastikbot \ + --prefix PYTHONPATH : ${with prev.python3.pkgs; makePythonPath [requests beautifulsoup4]} \ --add-flags "$out/drastikbot.py" ''; }; diff --git a/src/irc/irc.py b/src/irc/irc.py index 184e9ca..7714f93 100644 --- a/src/irc/irc.py +++ b/src/irc/irc.py @@ -205,7 +205,9 @@ class Drastikbot(): self.irc_socket = socket.create_connection( (self.var.host, self.var.port), 300) if self.var.ssl: - self.irc_socket = ssl.wrap_socket(self.irc_socket) + context = ssl.create_default_context() + self.irc_socket = context.wrap_socket( + self.irc_socket, server_hostname=self.var.host) except OSError: if self.var.sigint: return