Refactor examples

jstasiak · jstasiak · commit 2ce95f52e7a0 · 2014-07-08T08:15:46.000+01:00
diff --git a/examples/zwebbrowse.py b/examples/zwebbrowse.py
@@ -3,9 +3,8 @@
 """ Example of browsing for a service (in this case, HTTP) """
 
 import socket
-import time
 
-from zeroconf import ServiceBrowser, Zeroconf
+from zeroconf import raw_input, ServiceBrowser, Zeroconf
 
 
 class MyListener(object):
@@ -36,10 +35,11 @@ def addService(self, zeroconf, type, name):
 
 if __name__ == '__main__':
     print("Multicast DNS Service Discovery for Python Browser test")
-    r = Zeroconf()
+    zeroconf = Zeroconf()
     print("Testing browsing for a service...")
-    type = "_http._tcp.local."
     listener = MyListener()
-    browser = ServiceBrowser(r, type, listener)
-    time.sleep(5)
-    r.close()
+    browser = ServiceBrowser(zeroconf, "_http._tcp.local.", listener)
+    try:
+        raw_input("Waiting (press Enter to exit)...")
+    finally:
+        zeroconf.close()
diff --git a/examples/zwebtest.py b/examples/zwebtest.py
@@ -4,12 +4,7 @@
 
 import socket
 
-from zeroconf import ServiceInfo, Zeroconf
-
-try:
-    raw_input
-except NameError:
-    raw_input = input
+from zeroconf import raw_input, ServiceInfo, Zeroconf
 
 desc = {'path': '/~paulsm/'}
 
@@ -18,10 +13,12 @@
                    socket.inet_aton("10.0.1.2"), 80, 0, 0,
                    desc, "ash-2.local.")
 
-r = Zeroconf()
+zeroconf = Zeroconf()
 print("Registration of a service...")
-r.registerService(info)
-raw_input("Waiting (press Enter to exit)...")
-print("Unregistering...")
-r.unregisterService(info)
-r.close()
+zeroconf.registerService(info)
+try:
+    raw_input("Waiting (press Enter to exit)...")
+finally:
+    print("Unregistering...")
+    zeroconf.unregisterService(info)
+    zeroconf.close()
diff --git a/zeroconf.py b/zeroconf.py
@@ -57,6 +57,11 @@
 else:
     byte_ord = ord
 
+try:
+    raw_input = raw_input
+except NameError:
+    raw_input = input
+
 # hook for threads
 
 _GLOBAL_DONE = False
