diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 6864ff6e..91414a66 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -5,7 +5,7 @@ jobs:
     strategy:
       fail-fast: False
       matrix:
-        ubuntu: ['ubuntu-20.04', 'ubuntu-22.04']
+        ubuntu: ['ubuntu-24.04', 'ubuntu-22.04']
     name: FCM Tests ${{matrix.ubuntu}}
     runs-on: ${{matrix.ubuntu}}
     steps:
diff --git a/sbin/svnperms.py b/sbin/svnperms.py
index 8156b1e3..38b40cb4 100755
--- a/sbin/svnperms.py
+++ b/sbin/svnperms.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
 #
@@ -22,8 +22,8 @@
 #
 
 # THIS DISTRIBUTION HAS BEEN MODIFIED.
-# Original source downloaded from r1295006 at:
-# https://svn.apache.org/viewvc/subversion/trunk/tools/hook-scripts/svnperms.py
+# Original source downloaded from r1886358 at:
+# https://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/svnperms.py
 # This version is modified to allow custom permission message per repository.
 # It also fixes the Config.get method.
 
@@ -138,7 +138,8 @@ def parse_groups(self, groupsiter):
                     try:
                         groupusers.extend(self._group[token[1:]])
                     except KeyError:
-                        raise Error, "group '%s' not found" % token[1:]
+                        raise Error("group '%s' not found" % \
+                                     token[1:])
                 else:
                     groupusers.append(token)
             self._group[option] = groupusers
@@ -302,7 +303,7 @@ class MissingArgumentsException(Exception):
 def parse_options():
     try:
         opts, args = my_getopt(sys.argv[1:], "f:s:r:t:R:A:h", ["help"])
-    except getopt.GetoptError, e:
+    except getopt.GetoptError as e:
         raise Error(e.msg)
     class Options: pass
     obj = Options()
@@ -355,11 +356,11 @@ def main():
         check_perms(opts.filename, opts.section,
                     opts.repository, opts.transaction, opts.revision,
                     opts.author)
-    except MissingArgumentsException, e:
+    except MissingArgumentsException as e:
         sys.stderr.write("%s\n" % str(e))
         sys.stderr.write(USAGE)
         sys.exit(1)
-    except Error, e:
+    except Error as e:
         sys.stderr.write("error: %s\n" % str(e))
         sys.exit(1)