1 files changed, 7 insertions, 6 deletions

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 4589a828ebe..20176944ebc 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -681,14 +681,15 @@ START is the buffer position where the sexp starts."
                                  (current-column))
                                 (t
                                  (goto-char context-start)
-                                 (if (not (member
-                                           (save-excursion
-                                             (back-to-indentation)
-                                             (message (current-word)))
-                                           '("return" "import" "from")))
+                                 (if (not
+                                      (save-excursion
+                                        (back-to-indentation)
+                                        (looking-at
+                                         "\\(?:return\\|from\\|import\\)\s+")))
                                      (current-indentation)
                                    (+ (current-indentation)
-                                      python-indent-offset))))))
+                                      (length
+                                       (match-string-no-properties 0))))))))
              indentation))
           ('inside-paren
            (or (save-excursion