From c1f0c76d1709f7fa4e2e4a494d1cf727b6a20ecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Sun, 21 Sep 2014 18:14:01 +0200 Subject: [PATCH] Properly handle non-ASCII instance names --- src/octoprint/plugins/discovery/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/octoprint/plugins/discovery/__init__.py b/src/octoprint/plugins/discovery/__init__.py index 1268efe2..27095308 100644 --- a/src/octoprint/plugins/discovery/__init__.py +++ b/src/octoprint/plugins/discovery/__init__.py @@ -83,10 +83,10 @@ del get_uuid def get_instance_name(): name = s.globalGet(["appearance", "name"]) if name: - return "OctoPrint instance \"{}\"".format(name) + return u"OctoPrint instance \"{}\"".format(name) else: import socket - return "OctoPrint instance on {}".format(socket.gethostname()) + return u"OctoPrint instance on {}".format(socket.gethostname()) #~~ custom blueprint for providing discovery.xml @@ -221,7 +221,7 @@ class DiscoveryPlugin(octoprint.plugin.StartupPlugin, key = (reg_type, port) self._sd_refs[key] = pybonjour.DNSServiceRegister(**params) - self.logger.info("Registered {name} for {reg_type}".format(**locals())) + self.logger.info(u"Registered {name} for {reg_type}".format(**locals())) def zeroconf_unregister(self, reg_type, port=None): """ @@ -660,7 +660,7 @@ class DiscoveryPlugin(octoprint.plugin.StartupPlugin, sock.setsockopt(socket.IPPROTO_IP, socket.IP_ADD_MEMBERSHIP, socket.inet_aton(self.__class__.ssdp_multicast_addr) + socket.inet_aton('0.0.0.0')) - self.logger.info("Registered {} for SSDP".format(get_instance_name())) + self.logger.info(u"Registered {} for SSDP".format(get_instance_name())) self._ssdp_notify(alive=True)