Skip to content

Commit

Permalink
fixed bug introduced in v2.1.22
Browse files Browse the repository at this point in the history
  • Loading branch information
DamnWidget committed Sep 28, 2017
1 parent aa01ed2 commit 5233ad2
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 6 deletions.
24 changes: 19 additions & 5 deletions anaconda_lib/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,15 +250,29 @@ def get_settings(view, name, default=None):
break # stop loop

r = view.settings().get(name, plugin_settings.get(name, default))
if name == 'python_interpreter' or name == 'extra_paths':
w = view.window()
if w is not None:
r = sublime.expand_variables(r, w.extract_variables())
r = os.path.expanduser(os.path.expandvars(r))
if name == 'python_interpreter':
r = expand(view, r)
elif name == 'extra_paths':
if isinstance(r, (list, tuple)):
r = [expand(view, e) for e in r]
else:
r = expand(view, r)

return r


def expand(view, path):
"""Expand the given path
"""

window = view.window()
if window is not None:
tmp = sublime.expand_variables(path, window.extract_variables())
tmp = os.path.expanduser(os.path.expandvars(tmp))

return tmp


def active_view():
"""Return the active view
"""
Expand Down
3 changes: 2 additions & 1 deletion messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,6 @@
"2.1.19": "messages/2.1.19.txt",
"2.1.20": "messages/2.1.20.txt",
"2.1.21": "messages/2.1.21.txt",
"2.1.22": "messages/2.1.22.txt"
"2.1.22": "messages/2.1.22.txt",
"2.1.23": "messages/2.1.23.txt"
}
15 changes: 15 additions & 0 deletions messages/2.1.23.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@

|
_` | __ \ _` | __| _ \ __ \ _` | _` |
( | | | ( | ( ( | | | ( | ( |
\__,_| _| _| \__,_| \___| \___/ _| _| \__,_| \__,_|
The Sublime Text 3 Python IDE


Anaconda v2.1.23
================

Welcome to new anaconda v2.1.23, what can yo find in this minor release?

## Fixes
- Fixed bug introduced in the v2.1.22

0 comments on commit 5233ad2

Please sign in to comment.