diff options
| author | Fabián Ezequiel Gallina | 2014-11-16 10:47:14 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina | 2014-11-16 10:47:14 -0300 |
| commit | 6f167f95dc9dae8fc8533ee4d9a497c4f08021b2 (patch) | |
| tree | 1a6369c5f85eb12ffad8a286d063eb31709d5204 /test/automated/python-tests.el | |
| parent | 2444ac6de86b318763f0cc8b1de5fb757cb09170 (diff) | |
| download | emacs-6f167f95dc9dae8fc8533ee4d9a497c4f08021b2.tar.gz emacs-6f167f95dc9dae8fc8533ee4d9a497c4f08021b2.zip | |
* lisp/progmodes/python.el (python-shell-calculate-command): Rename
from python-shell-parse-command. Cleanup.
(run-python, run-python-internal): Use it.
(python-shell-calculate-pythonpath): Rename from
python-new-pythonpath.
(python-shell-calculate-process-environment): Use it.
(python-shell-calculate-exec-path): Add comment.
* test/automated/python-tests.el
(python-shell-calculate-process-environment-2): Fix test.
(python-shell-calculate-process-environment-1)
(python-shell-calculate-process-environment-3): Cleanup.
Diffstat (limited to 'test/automated/python-tests.el')
| -rw-r--r-- | test/automated/python-tests.el | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el index f368f995cae..e4ce5355a84 100644 --- a/test/automated/python-tests.el +++ b/test/automated/python-tests.el | |||
| @@ -1836,8 +1836,7 @@ Using `python-shell-interpreter' and | |||
| 1836 | 1836 | ||
| 1837 | (ert-deftest python-shell-calculate-process-environment-1 () | 1837 | (ert-deftest python-shell-calculate-process-environment-1 () |
| 1838 | "Test `python-shell-process-environment' modification." | 1838 | "Test `python-shell-process-environment' modification." |
| 1839 | (let* ((original-process-environment process-environment) | 1839 | (let* ((python-shell-process-environment |
| 1840 | (python-shell-process-environment | ||
| 1841 | '("TESTVAR1=value1" "TESTVAR2=value2")) | 1840 | '("TESTVAR1=value1" "TESTVAR2=value2")) |
| 1842 | (process-environment | 1841 | (process-environment |
| 1843 | (python-shell-calculate-process-environment))) | 1842 | (python-shell-calculate-process-environment))) |
| @@ -1846,8 +1845,8 @@ Using `python-shell-interpreter' and | |||
| 1846 | 1845 | ||
| 1847 | (ert-deftest python-shell-calculate-process-environment-2 () | 1846 | (ert-deftest python-shell-calculate-process-environment-2 () |
| 1848 | "Test `python-shell-extra-pythonpaths' modification." | 1847 | "Test `python-shell-extra-pythonpaths' modification." |
| 1849 | (let* ((original-process-environment process-environment) | 1848 | (let* ((process-environment process-environment) |
| 1850 | (original-pythonpath (getenv "PYTHONPATH")) | 1849 | (original-pythonpath (setenv "PYTHONPATH" "path3")) |
| 1851 | (paths '("path1" "path2")) | 1850 | (paths '("path1" "path2")) |
| 1852 | (python-shell-extra-pythonpaths paths) | 1851 | (python-shell-extra-pythonpaths paths) |
| 1853 | (process-environment | 1852 | (process-environment |
| @@ -1859,8 +1858,7 @@ Using `python-shell-interpreter' and | |||
| 1859 | 1858 | ||
| 1860 | (ert-deftest python-shell-calculate-process-environment-3 () | 1859 | (ert-deftest python-shell-calculate-process-environment-3 () |
| 1861 | "Test `python-shell-virtualenv-path' modification." | 1860 | "Test `python-shell-virtualenv-path' modification." |
| 1862 | (let* ((original-process-environment process-environment) | 1861 | (let* ((original-path (or (getenv "PATH") "")) |
| 1863 | (original-path (or (getenv "PATH") "")) | ||
| 1864 | (python-shell-virtualenv-path | 1862 | (python-shell-virtualenv-path |
| 1865 | (directory-file-name user-emacs-directory)) | 1863 | (directory-file-name user-emacs-directory)) |
| 1866 | (process-environment | 1864 | (process-environment |