fix bug pull request and remove command.getOutput (compatibility with…

… last python
devildant · Aug 11, 2019 · 29b6e01 · 29b6e01
1 parent 4861648
commit 29b6e01
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/octoprint_shutdownprinter/__init__.py b/octoprint_shutdownprinter/__init__.py
@@ -9,7 +9,6 @@
 from octoprint.events import eventManager, Events
 from flask import make_response
 import time
-import commands
 
 class shutdownprinterPlugin(octoprint.plugin.SettingsPlugin,
 							  octoprint.plugin.AssetPlugin,
@@ -288,8 +287,9 @@ def _shutdown_printer_API_CMD(self, mode):
 
         def _extraCommand(self):
                 if self.extraCommand != "":
-                        mCmdFound = commands.getoutput(self.extraCommand)
-                        self._logger.info("response extraCommand: %s" % mCmdFound)
+						process = subprocess.Popen(mCmdFound, shell=True, stdin = None, stdout=subprocess.PIPE)
+						self.extraCommand = process.communicate()
+                        self._logger.info("response extraCommand: %s" % mCmdFound.rstrip().strip())
 
         def _shutdown_printer_by_API(self):
                 url = "http://127.0.0.1:" + str(self.api_plugin_port) + "/api/plugin/" + self.api_plugin_name

diff --git a/octoprint_shutdownprinter/static/js/shutdownprinter.js b/octoprint_shutdownprinter/static/js/shutdownprinter.js
@@ -103,7 +103,7 @@ $(function() {
 		]
 		self.listOffHTTPMethode = [
 			{"id" : "#shutdownprinter_api_custom_GET"},
-            {"id" : "#shutdownprinter_api_custom_POST"}
+            {"id" : "#shutdownprinter_api_custom_POST"},
             {"id" : "#shutdownprinter_api_custom_PUT"}
 		]
 		self.eventChangeCheckToRadio("#shutdownprinter_mode_shutdown_gcode", self.listOffMode);