diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 4b940b3..b625948 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1121,7 +1121,8 @@ fontified."
       name: (identifier) @font-lock-function-name-face)
      (class_definition
       name: (identifier) @font-lock-type-face)
-     (parameters (identifier) @font-lock-variable-name-face))
+     (parameters (identifier) @font-lock-variable-name-face)
+     (parameters (default_parameter name: (identifier) @font-lock-variable-name-face)))
 
    :feature 'function
    :language 'python
@@ -2825,26 +2826,26 @@ of `exec-path'."
   (let ((env (append (when (fboundp 'tramp-get-remote-locale)
                        ;; Emacs<24.4 compat.
                        (list (tramp-get-remote-locale vec)))
-		     (copy-sequence env)))
+                     (copy-sequence env)))
         (tramp-end-of-heredoc
          (if (boundp 'tramp-end-of-heredoc)
              tramp-end-of-heredoc
            (md5 tramp-end-of-output)))
-	unset vars item)
+        unset vars item)
     (while env
       (setq item (split-string (car env) "=" 'omit))
       (setcdr item (mapconcat #'identity (cdr item) "="))
       (if (and (stringp (cdr item)) (not (string-equal (cdr item) "")))
-	  (push (format "%s %s" (car item) (cdr item)) vars)
-	(push (car item) unset))
+          (push (format "%s %s" (car item) (cdr item)) vars)
+        (push (car item) unset))
       (setq env (cdr env)))
     (when vars
       (tramp-send-command
        vec
        (format "while read var val; do export $var=$val; done <<'%s'\n%s\n%s"
-	       tramp-end-of-heredoc
-	       (mapconcat #'identity vars "\n")
-	       tramp-end-of-heredoc)
+               tramp-end-of-heredoc
+               (mapconcat #'identity vars "\n")
+               tramp-end-of-heredoc)
        t))
     (when unset
       (tramp-send-command
@@ -6538,9 +6539,9 @@ recursively."
         (python--list-imports-check-status status)
         (goto-char (point-min))
         (while (not (eobp))
-	  (push (buffer-substring-no-properties (point) (pos-eol))
+          (push (buffer-substring-no-properties (point) (pos-eol))
                 lines)
-	  (forward-line 1))
+          (forward-line 1))
         (nreverse lines)))))
 
 (defun python--query-import (name source prompt)
@@ -6666,7 +6667,7 @@ asking."
                  (push (match-string 1) undefined))
                 ((looking-at ".*'\\([^']+\\)' imported but unused$")
                  (push (match-string 1) unused)))
-	  (forward-line 1))))
+          (forward-line 1))))
     ;; Compute imports to be added
     (dolist (name (seq-uniq undefined))
       (when-let ((statement (python--query-import name