--- a/README.md Fri Sep 22 18:06:15 2017 +0300
+++ b/README.md Fri Sep 22 20:12:22 2017 +0300
@@ -19,7 +19,7 @@
sudo apt-get install build-essential bison flex autoconf
sudo apt-get install python-wxgtk3.0 pyro mercurial
-sudo apt-get install python-numpy python-nevow python-matplotlib python-lxml
+sudo apt-get install python-nevow python-matplotlib python-lxml python-zeroconf --- a/connectors/PYRO/__init__.py Fri Sep 22 18:06:15 2017 +0300
+++ b/connectors/PYRO/__init__.py Fri Sep 22 20:12:22 2017 +0300
@@ -84,13 +84,13 @@
if location.find(service_type) != -1:
- from util.Zeroconf import Zeroconf
+ from zeroconf import Zeroconf - i = r.getServiceInfo(service_type, location)
+ i = r.get_service_info(service_type, location) raise Exception("'%s' not found" % location)
- ip = str(socket.inet_ntoa(i.getAddress()))
- port = str(i.getPort())
+ ip = str(socket.inet_ntoa(i.address)) newlocation = ip + ':' + port
confnodesroot.logger.write(_("'{a1}' is located at {a2}\n").format(a1=location, a2=newlocation))
--- a/dialogs/DiscoveryDialog.py Fri Sep 22 18:06:15 2017 +0300
+++ b/dialogs/DiscoveryDialog.py Fri Sep 22 20:12:22 2017 +0300
@@ -26,7 +26,7 @@
import wx.lib.mixins.listctrl as listmix
-from util.Zeroconf import *
+from zeroconf import ServiceBrowser, Zeroconf @@ -207,7 +207,7 @@
- def removeService(self, zeroconf, _type, name):
+ def remove_service(self, zeroconf, _type, name): wx.CallAfter(self._removeService, name)
def _removeService(self, name):
@@ -227,19 +227,18 @@
self.ServicesList.DeleteItem(idx)
- def addService(self, zeroconf, _type, name):
+ def add_service(self, zeroconf, _type, name): wx.CallAfter(self._addService, _type, name)
def _addService(self, _type, name):
called when a service with the desired type is discovered.
- info = self.ZeroConfInstance.getServiceInfo(_type, name)
+ info = self.ZeroConfInstance.get_service_info(_type, name) svcname = name.split(".")[0]
typename = _type.split(".")[0][1:]
- ip = str(socket.inet_ntoa(info.getAddress()))
+ ip = str(socket.inet_ntoa(info.address)) num_items = self.ServicesList.GetItemCount()
--- a/runtime/ServicePublisher.py Fri Sep 22 18:06:15 2017 +0300
+++ b/runtime/ServicePublisher.py Fri Sep 22 20:12:22 2017 +0300
@@ -25,7 +25,7 @@
from __future__ import print_function
-from util import Zeroconf
service_type = '_PYRO._tcp.local.'
@@ -55,7 +55,7 @@
- self.server = Zeroconf.Zeroconf(ip)
+ self.server = zeroconf.Zeroconf() print("MDNS brodcasting on :" + ip)
@@ -63,8 +63,8 @@
print("MDNS brodcasted service address :" + ip)
self.ip_32b = socket.inet_aton(ip)
- self.server.registerService(
- Zeroconf.ServiceInfo(service_type,
+ self.server.register_service( + zeroconf.ServiceInfo(service_type, @@ -75,14 +75,15 @@
if self.retrytimer is not None:
- self.server.unregisterService(
- Zeroconf.ServiceInfo(service_type,
- properties=self.serviceproperties))
+ if self.server is not None: + self.server.unregister_service( + zeroconf.ServiceInfo(service_type, + properties=self.serviceproperties)) def gethostaddr(self, dst='224.0.1.41'):
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)