additional python 3 compatibility bugs, jneilliii#25

octoprint_rtmpstreamer/__init__.py

@@ -23,7 +23,7 @@ def on_after_startup(self):
 			self.container = self.client.containers.get('RTMPStreamer')
 			self._logger.info("%s is streaming " % self.container.name)
 			self._plugin_manager.send_plugin_message(self._identifier, dict(status=True,streaming=True))
-		except Exception, e:
+		except Exception as e:
 			self._logger.error(str(e))
 			self._plugin_manager.send_plugin_message(self._identifier, dict(status=True,streaming=False))
 
@@ -96,7 +96,7 @@ def startStream(self):
 			try:
 				self.container = self.client.containers.run("octoprint/rtmpstreamer:latest",command=[self._settings.global_get(["webcam","stream"]),self._settings.get(["stream_resolution"]),self._settings.get(["stream_framerate"]),self._settings.get(["stream_url"]),",".join(filters)],detach=True,privileged=False,devices=["/dev/vchiq"],name="RTMPStreamer",auto_remove=True,network_mode="host")
 				self._plugin_manager.send_plugin_message(self._identifier, dict(status=True,streaming=True))
-			except Exception, e:
+			except Exception as e:
 				self._plugin_manager.send_plugin_message(self._identifier, dict(error=str(e),status=True,streaming=False))	
 
 	def stopStream(self):
@@ -105,7 +105,7 @@ def stopStream(self):
 				self.container.stop()
 				self.container = None
 				self._plugin_manager.send_plugin_message(self._identifier, dict(status=True,streaming=False))
-			except Exception, e:
+			except Exception as e:
 				self._plugin_manager.send_plugin_message(self._identifier, dict(error=str(e),status=True,streaming=False))
 		else:
 			self._plugin_manager.send_plugin_message(self._identifier, dict(status=True,streaming=False))

requirements.txt

@@ -7,3 +7,4 @@
 ###
 
 .
+docker==2.7.0

setup.py

@@ -14,7 +14,7 @@
 plugin_name = "RTMP Streamer"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "0.1.5rc1"
+plugin_version = "0.1.5rc2"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module