initial support for python3

Author: jwcooper

helpers/python/debug_helper.js

@@ -1,5 +1,6 @@
 var spawn = require('child_process').spawn,
     exec = require('child_process').exec,
+    db = require('../../models/webideModel'),
     net = require('net'),
     path = require('path'),
     ws_helper = require('../websocket_helper'),
@@ -29,39 +30,46 @@ exports.start_debug = function start_debug(file, socket) {
   console.log(!debug_program);
   if (!debug_program) {
     console.log('spawn debugger');
-    debug_program = spawn("sudo", ["python", "debugger.py"], {cwd: __dirname});
-    var buffer = "";
-    debug_program.stdout.on('data', function(data) {
-      console.log(data.toString());
+    db.findOne({type: "editor:settings"}, function(err, settings) {
+      var command = 'python';
+      if (typeof settings !== 'undefined' && settings.python_version === '3') {
+        command = 'python3';
+      }
 
-      buffer += data.toString();
+      debug_program = spawn("sudo", [command, "debugger.py"], {cwd: __dirname});
+      var buffer = "";
+      debug_program.stdout.on('data', function(data) {
+        console.log(data.toString());
 
-      if (buffer.indexOf("DEBUGGER READY") !== -1 && !client_connected) {
-        console.log("DEBUGGER READY");
-        connect_client(file, socket);
-        console.log("after connect_client");
-      }
+        buffer += data.toString();
 
-    });
+        if (buffer.indexOf("DEBUGGER READY") !== -1 && !client_connected) {
+          console.log("DEBUGGER READY");
+          connect_client(file, socket);
+          console.log("after connect_client");
+        }
 
-    debug_program.stderr.on('data', function(data) {
-      console.log(data.toString());
-      ws_helper.send_message(socket, 'debug-error', {file: file, error: data});
-    });
+      });
 
-    debug_program.on('error', function(data) {
-      console.log("DEBUG PROGRAM ERROR:");
-      console.log(data);
-    });
+      debug_program.stderr.on('data', function(data) {
+        console.log(data.toString());
+        ws_helper.send_message(socket, 'debug-error', {file: file, error: data});
+      });
 
-    debug_program.on('exit', function(code) {
-      console.log('Debug Program Exit');
-      console.log(code);
-      debug_program = null;
+      debug_program.on('error', function(data) {
+        console.log("DEBUG PROGRAM ERROR:");
+        console.log(data);
+      });
 
-      if (enable_debug) {
-        self.start_debug(file, socket);
-      }
+      debug_program.on('exit', function(code) {
+        console.log('Debug Program Exit');
+        console.log(code);
+        debug_program = null;
+
+        if (enable_debug) {
+          self.start_debug(file, socket);
+        }
+      });
     });
   } else {
     //console.log('resetting debugger');

public/javascripts/editor.js

@@ -663,6 +663,7 @@
           if (is_script(file.extension)) {
             $(templates.editor_bar_run_link).appendTo('.editor-bar-actions');
             $(templates.editor_bar_debug_link).appendTo('.editor-bar-actions');
+            
             //$(templates.editor_bar_trace_link).appendTo('.editor-bar-actions');
           }
 
@@ -1243,7 +1244,13 @@
       //var command;
       //Running as sudo is temporary.  It's a necessary evil to access GPIO at this point.
       if (file.extension === 'py') {
-        command = "sudo python ";
+        if (typeof settings !== 'undefined') {
+          if (settings.python_version === '3') {
+            command = "sudo python3 ";
+          } else {
+            command = "sudo python ";
+          }
+        }
       } else if (file.extension === 'rb') {
         command = "sudo ruby ";
       } else if (file.extension === 'js') {
@@ -1767,6 +1774,12 @@
         set_settings({"manual_git": $(this).text().toLowerCase()});
       }
 
+      function set_python_version(event) {
+        $('.python-version').removeClass('selected');
+        $(this).addClass('selected');
+        set_settings({"python_version": $(this).text().replace('_', '')});
+      }
+
       if (typeof settings !== 'undefined') {
         if (settings.font_size) {
           $('.font-size-value._' + settings.font_size + 'px').addClass('selected');
@@ -1793,12 +1806,18 @@
         } else {
           $('.manual-git-value.off').addClass('selected');
         }
+        if (settings.python_version) {
+          $('.python-version._' + settings.python_version).addClass('selected');
+        } else {
+          $('.python-version._2').addClass('selected');
+        }
       } else {
         $('.font-size-value.12px').addClass('selected');
         $('.soft-tab-value.on').addClass('selected');
         $('.tab-size.4').addClass('selected');
         $('.invisibles-value.off').addClass('selected');
         $('.manual-git-value.off').addClass('selected');
+        $('.python-version.python').addClass('selected');
       }
 
       $('#editor').hide();
@@ -1810,6 +1829,7 @@
       $(document).on('click touchstart', '.tab-size-value', set_tab_size);
       $(document).on('click touchstart', '.invisibles-value', set_show_invisibles);
       $(document).on('click touchstart', '.manual-git-value', set_manual_git);
+      $(document).on('click touchstart', '.python-version', set_python_version);
       $(document).on('click touchstart', '.close-settings-manager', close_settings_manager);
     }
 

public/stylesheets/app.css

@@ -530,7 +530,7 @@ a.navigator-settings i.settings-enabled {
   margin: 0 1px 0 0;
 }
 
-.settings-element .font-size-value, .soft-tab-value, .tab-size-value, .invisibles-value, .manual-git-value {
+.settings-element .font-size-value, .soft-tab-value, .tab-size-value, .invisibles-value, .manual-git-value, .python-version {
   cursor: pointer;
 }
 

scripts/install.sh

@@ -108,7 +108,7 @@ echo "**** Starting the server...(please wait) ****"
 sleep 20s
 
 echo "**** The Adafruit WebIDE is installed and running! ****"
-echo "**** Commands: sudo service adafruit-webide.sh {start,stop,restart} ****"
+echo "**** Commands: sudo systemctl {start,stop,restart} adafruit-webide ****"
 echo "**** Navigate to http://$(hostname).local:8080 to use the WebIDE"
 #echo "**** To run the editor: ****"
 #echo "**** cd ~/Adafruit/WebIDE ****"

views/editor/index.pug

@@ -51,6 +51,10 @@ block content
             span Manual Git commit and push (advanced)
             span.manual-git-value.on On
             span.manual-git-value.off Off
+          .settings-element
+            span Python Version:
+            span.python-version._2 2
+            span.python-version._3 3
       #editor
       #editor-output-wrapper
         .dragbar