aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorFabián Ezequiel Gallina2014-07-20 15:12:30 -0300
committerFabián Ezequiel Gallina2014-07-20 15:12:30 -0300
commitb06a0dff84b2ec6b32e5740c17d595f6874e884f (patch)
treee5d930815db4de04d665780e1a0979b2a147efc3 /test
parent880b716696b4d8737e7199d6487f17b7e6825dd4 (diff)
downloademacs-b06a0dff84b2ec6b32e5740c17d595f6874e884f.tar.gz
emacs-b06a0dff84b2ec6b32e5740c17d595f6874e884f.zip
Make python.el work with IPython automatically.
* lisp/progmodes/python.el: (python-shell-completion-setup-code): New value supporting iPython. (python-shell-completion-string-code): New value supporting iPython. (python-shell-completion-get-completions): Use them. (python-shell-completion-module-string-code): Make obsolete. (python-shell-prompt-input-regexps) (python-shell-prompt-output-regexps): Add safeguard for ipdb. (python-shell-output-filter): Fix comment typo. * test/automated/python-tests.el: (python-util-clone-local-variables-1): Fix test. Fixes: debbugs:15510
Diffstat (limited to 'test')
-rw-r--r--test/ChangeLog5
-rw-r--r--test/automated/python-tests.el2
2 files changed, 5 insertions, 2 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index b4b3bedcbdc..451fa91548f 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
12014-07-20 Fabián Ezequiel Gallina <fgallina@gnu.org>
2
3 * automated/python-tests.el:
4 (python-util-clone-local-variables-1): Fix test.
5
12014-07-17 Fabián Ezequiel Gallina <fgallina@gnu.org> 62014-07-17 Fabián Ezequiel Gallina <fgallina@gnu.org>
2 7
3 * automated/python-tests.el (python-shell-make-comint-1): 8 * automated/python-tests.el (python-shell-make-comint-1):
diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el
index a60da31e44c..81f4567091e 100644
--- a/test/automated/python-tests.el
+++ b/test/automated/python-tests.el
@@ -3619,8 +3619,6 @@ def foo(a, b, c):
3619 (python-shell-extra-pythonpaths "/home/user/pylib/") 3619 (python-shell-extra-pythonpaths "/home/user/pylib/")
3620 (python-shell-completion-setup-code 3620 (python-shell-completion-setup-code
3621 . "from IPython.core.completerlib import module_completion") 3621 . "from IPython.core.completerlib import module_completion")
3622 (python-shell-completion-module-string-code
3623 . "';'.join(module_completion('''%s'''))\n")
3624 (python-shell-completion-string-code 3622 (python-shell-completion-string-code
3625 . "';'.join(get_ipython().Completer.all_completions('''%s'''))\n") 3623 . "';'.join(get_ipython().Completer.all_completions('''%s'''))\n")
3626 (python-shell-virtualenv-path 3624 (python-shell-virtualenv-path