Merge remote-tracking branch 'origin/master'

yrashk · Sep 9, 2012 · 625b584 · 625b584
2 parents 60a3799 + 57666c7
commit 625b584
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 1 deletion.
diff --git a/config/Tower/Default.sublime-commands b/config/Tower/Default.sublime-commands
@@ -0,0 +1,10 @@
+[
+    {
+        "caption": "SublimeREPL: Tower Console",
+        "command": "run_existing_window_command", "args":
+        {
+            "id": "repl_tower",
+            "file": "config/Tower/Main.sublime-menu"
+        }
+    }
+]
diff --git a/config/Tower/Main.sublime-menu b/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"}
+                    }
+                }
+            ]   
+        }]
+    }
+]
diff --git a/lang_integration.py b/lang_integration.py
@@ -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",