Merge branch 'master' into unstable

gns3server/modules/port_manager.py

@@ -90,7 +90,7 @@ class PortManager:
 
         return self._console_port_range
 
-    @console_host.setter
+    @console_port_range.setter
     def console_port_range(self, new_range):
 
         assert isinstance(new_range, tuple)
@@ -111,7 +111,7 @@ class PortManager:
 
         return self._udp_port_range
 
-    @udp_host.setter
+    @udp_port_range.setter
     def udp_port_range(self, new_range):
 
         assert isinstance(new_range, tuple)

gns3server/web/logger.py

@@ -94,7 +94,6 @@ class WinStreamHandler(logging.StreamHandler):
             stream.write(msg.encode(stream.encoding, errors="replace").decode(stream.encoding))
             stream.write(self.terminator)
             self.flush()
-            pass
         except Exception:
             self.handleError(record)