Fix completion retrieval parsing.

* progmodes/python.el (python-mode):
(python-util-strip-string): New function.
(python-shell-completion-get-completions): Use it.

* automated/python-tests.el (python-util-strip-string-1): New test.

Fixes: debbugs:17209

2 files changed, 13 insertions, 0 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 443479b099e..f86084739af 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-21  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        * automated/python-tests.el (python-util-strip-string-1): New test.
+
 2014-05-08  Glenn Morris  <rgm@gnu.org>
 
         * automated/vc-bzr.el (vc-bzr-test-bug9726, vc-bzr-test-bug9781)
diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el
index de963a670bc..f580e946b8f 100644
--- a/test/automated/python-tests.el
+++ b/test/automated/python-tests.el
@@ -2706,6 +2706,15 @@ def foo(a, b, c):
         (equal (symbol-value (car ccons)) (cdr ccons)))))
     (kill-buffer buffer)))
 
+(ert-deftest python-util-strip-string-1 ()
+  (should (string= (python-util-strip-string "\t\r\n    str") "str"))
+  (should (string= (python-util-strip-string "str \n\r") "str"))
+  (should (string= (python-util-strip-string "\t\r\n    str \n\r ") "str"))
+  (should
+   (string= (python-util-strip-string "\n str \nin \tg \n\r") "str \nin \tg"))
+  (should (string= (python-util-strip-string "\n \t \n\r ") ""))
+  (should (string= (python-util-strip-string "") "")))
+
 
 ;;; Electricity