Permalink
Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information...
2 parents 60a3799 + 57666c7 commit 625b58439afedd5303a2b236c6f0fcd02ab94d52 @wuub wuub committed Sep 9, 2012
Showing with 38 additions and 1 deletion.
  1. +10 −0 config/Tower/Default.sublime-commands
  2. +27 −0 config/Tower/Main.sublime-menu
  3. +1 −1 lang_integration.py
@@ -0,0 +1,10 @@
+[
+ {
+ "caption": "SublimeREPL: Tower Console",
+ "command": "run_existing_window_command", "args":
+ {
+ "id": "repl_tower",
+ "file": "config/Tower/Main.sublime-menu"
+ }
+ }
+]
@@ -0,0 +1,27 @@
+[
+ {
+ "id": "tools",
+ "children":
+ [{
+ "caption": "SublimeREPL",
+ "mnemonic": "r",
+ "id": "SublimeREPL",
+ "children":
+ [
+ {"command": "repl_open",
+ "id": "repl_tower",
+ "caption": "Tower Console",
+ "args": {
+ "cwd": "$file_path",
+ "type": "subprocess",
+ "encoding": "utf8",
+ "cmd": ["tower", "console", "-c"],
+ "syntax": "Packages/CoffeeScript/CoffeeScript.tmLanguage",
+ "external_id": "tower",
+ "extend_env": {"NODE_DISABLE_COLORS": "1"}
+ }
+ }
+ ]
+ }]
+ }
+]
View
@@ -91,7 +91,7 @@ def run_virtualenv(self, choices, index):
(name, directory) = choices[index]
activate_file = os.path.join(directory, "activate_this.py")
- init_cmd = "execfile('{activate_file}', dict(__file__='{activate_file}')); import site; import sys; sys.ps1 = '({name}) >>> '; del sys;".format(name=name, activate_file=activate_file)
+ init_cmd = "execfile(r'{activate_file}', dict(__file__=r'{activate_file}')); import site; import sys; sys.ps1 = '({name}) >>> '; del sys;".format(name=name, activate_file=activate_file)
self.window.run_command("repl_open",
{
"type":"telnet",

0 comments on commit 625b584

Please sign in to comment.