|
1 | 1 | import os
|
2 | 2 |
|
3 |
| -import sublime, sublime_plugin |
| 3 | +import sublime_plugin |
| 4 | + |
4 | 5 |
|
5 | 6 | class VirtualenvExecCommand(sublime_plugin.WindowCommand):
|
6 | 7 | def run(self, working_dir="", path=None, virtualenv_dir=None, **kwargs):
|
7 |
| - view_settings = self.window.active_view().settings() |
8 |
| - working_dir = view_settings.get("build_working_dir", working_dir) |
| 8 | + view_settings = self.window.active_view().settings() |
| 9 | + working_dir = view_settings.get("build_working_dir", working_dir) |
| 10 | + |
| 11 | + if virtualenv_dir is None: |
| 12 | + virtualenv_dir = view_settings.get("virtualenv_dir") |
| 13 | + |
| 14 | + venv_bin_path = os.path.join(virtualenv_dir, "bin") |
9 | 15 |
|
10 |
| - if virtualenv_dir is None: |
11 |
| - virtualenv_dir = view_settings.get("virtualenv_dir") |
12 |
| - print repr(working_dir), repr(virtualenv_dir) |
13 |
| - venv_bin_path = os.path.join(virtualenv_dir, "bin") |
| 16 | + if path is not None: |
| 17 | + path = os.pathsep.join([path, venv_bin_path]) |
| 18 | + else: |
| 19 | + path = venv_bin_path |
14 | 20 |
|
15 |
| - if path is not None: |
16 |
| - path = os.pathsep.join([path, venv_bin_path]) |
17 |
| - else: |
18 |
| - path = venv_bin_path |
| 21 | + kwargs["working_dir"] = working_dir |
| 22 | + kwargs["path"] = path |
19 | 23 |
|
20 |
| - return self.window.run_command("exec", dict(working_dir=working_dir, path=path, **kwargs)) |
| 24 | + return self.window.run_command("exec", **kwargs) |
0 commit comments