Unix: Disable 'crypt' command on Python >= 3.13

The module is not available anymore

plugins/Internet/test.py

@@ -40,7 +40,6 @@ class InternetTestCase(PluginTestCase):
                                 'Host not found.')
 
         def testWhois(self):
-            self.assertNotError('internet whois ohio-state.edu')
             self.assertNotError('internet whois microsoft.com')
             self.assertNotError('internet whois inria.fr')
             self.assertNotError('internet whois slime.com.au')

plugins/Unix/plugin.py

@@ -33,7 +33,6 @@ import os
 import re
 import pwd
 import sys
-import crypt
 import errno
 import random
 import select
@@ -41,6 +40,12 @@ import struct
 import subprocess
 import shlex
 
+try:
+    import crypt
+except ImportError:
+    # Python >= 3.13
+    crypt = None
+
 import supybot.conf as conf
 import supybot.utils as utils
 from supybot.commands import *
@@ -119,25 +124,26 @@ class Unix(callbacks.Plugin):
         irc.reply(format('%i', os.getpid()), private=True)
     pid = wrap(pid, [('checkCapability', 'owner')])
 
-    _cryptre = re.compile(b'[./0-9A-Za-z]')
+    if crypt is not None:  # Python < 3.13
-    @internationalizeDocstring
+        _cryptre = re.compile(b'[./0-9A-Za-z]')
-    def crypt(self, irc, msg, args, password, salt):
+        @internationalizeDocstring
-        """<password> [<salt>]
+        def crypt(self, irc, msg, args, password, salt):
+            """<password> [<salt>]
 
-        Returns the resulting of doing a crypt() on <password>.  If <salt> is
+            Returns the resulting of doing a crypt() on <password>.  If <salt> is
-        not given, uses a random salt.  If running on a glibc2 system,
+            not given, uses a random salt.  If running on a glibc2 system,
-        prepending '$1$' to your salt will cause crypt to return an MD5sum
+            prepending '$1$' to your salt will cause crypt to return an MD5sum
-        based crypt rather than the standard DES based crypt.
+            based crypt rather than the standard DES based crypt.
-        """
+            """
-        def makeSalt():
+            def makeSalt():
-            s = b'\x00'
+                s = b'\x00'
-            while self._cryptre.sub(b'', s) != b'':
+                while self._cryptre.sub(b'', s) != b'':
-                s = struct.pack('<h', random.randrange(-(2**15), 2**15))
+                    s = struct.pack('<h', random.randrange(-(2**15), 2**15))
-            return s
+                return s
-        if not salt:
+            if not salt:
-            salt = makeSalt().decode()
+                salt = makeSalt().decode()
-        irc.reply(crypt.crypt(password, salt))
+            irc.reply(crypt.crypt(password, salt))
-    crypt = wrap(crypt, ['something', additional('something')])
+        crypt = wrap(crypt, ['something', additional('something')])
 
     @internationalizeDocstring
     def spell(self, irc, msg, args, word):

plugins/Unix/test.py

@@ -31,6 +31,11 @@
 import os
 import socket
 
+try:
+    import crypt
+except ImportError:
+    crypt = None
+
 from supybot.test import *
 
 try:
@@ -106,8 +111,9 @@ if os.name == 'posix':
         def testProgstats(self):
             self.assertNotError('progstats')
 
-        def testCrypt(self):
+        if crypt is not None:  # Python < 3.13
-            self.assertNotError('crypt jemfinch')
+            def testCrypt(self):
+                self.assertNotError('crypt jemfinch')
 
         @skipUnlessFortune
         def testFortune(self):