[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117717: Extract python-new-pythonpath to handle PYT
From: |
Sam Steingold |
Subject: |
[Emacs-diffs] trunk r117717: Extract python-new-pythonpath to handle PYTHONPATH in user code |
Date: |
Wed, 20 Aug 2014 15:33:14 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117717
revision-id: address@hidden
parent: address@hidden
committer: Sam Steingold <address@hidden>
branch nick: trunk
timestamp: Wed 2014-08-20 11:33:10 -0400
message:
Extract python-new-pythonpath to handle PYTHONPATH in user code
* lisp/progmodes/python.el (python-new-pythonpath): Extract from
`python-shell-calculate-process-environment'.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/progmodes/python.el python.el-20091113204419-o5vbwnq5f7feedwu-3008
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-08-18 19:28:40 +0000
+++ b/lisp/ChangeLog 2014-08-20 15:33:10 +0000
@@ -1,3 +1,8 @@
+2014-08-20 Sam Steingold <address@hidden>
+
+ * progmodes/python.el (python-new-pythonpath): Extract from
+ `python-shell-calculate-process-environment'.
+
2014-08-18 Thierry Volpiatto <address@hidden>
* emacs-lisp/eldoc.el (eldoc-highlight-function-argument): Add support
=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el 2014-08-04 21:35:17 +0000
+++ b/lisp/progmodes/python.el 2014-08-20 15:33:10 +0000
@@ -2069,6 +2069,16 @@
(executable-find python-shell-interpreter)
python-shell-interpreter-args)))
+(defun python-new-pythonpath ()
+ "Calculate the new PYTHONPATH value from `python-shell-extra-pythonpaths'."
+ (let ((pythonpath (getenv "PYTHONPATH"))
+ (extra (mapconcat 'identity
+ python-shell-extra-pythonpaths
+ path-separator)))
+ (if pythonpath
+ (concat extra path-separator pythonpath)
+ extra)))
+
(defun python-shell-calculate-process-environment ()
"Calculate process environment given `python-shell-virtualenv-path'."
(let ((process-environment (append
@@ -2078,13 +2088,7 @@
(directory-file-name python-shell-virtualenv-path)
nil)))
(when python-shell-extra-pythonpaths
- (setenv "PYTHONPATH"
- (format "%s%s%s"
- (mapconcat 'identity
- python-shell-extra-pythonpaths
- path-separator)
- path-separator
- (or (getenv "PYTHONPATH") ""))))
+ (setenv "PYTHONPATH" (python-new-pythonpath)))
(if (not virtualenv)
process-environment
(setenv "PYTHONHOME" nil)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117717: Extract python-new-pythonpath to handle PYTHONPATH in user code,
Sam Steingold <=