[pulsar] branch master updated: Fixed watch-znode script to work in Py2 (#3470)

[mm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new ebc381b  Fixed watch-znode script to work in Py2 (#3470)
ebc381b is described below

commit ebc381be0ead4e0ffff7b99f793f08ec1ff0671e
Author: Matteo Merli <mm...@apache.org>
AuthorDate: Thu Jan 31 08:50:04 2019 -0800

    Fixed watch-znode script to work in Py2 (#3470)
---
 docker/pulsar/scripts/watch-znode.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/docker/pulsar/scripts/watch-znode.py b/docker/pulsar/scripts/watch-znode.py
index 2aacffd..8bef9a6 100755
--- a/docker/pulsar/scripts/watch-znode.py
+++ b/docker/pulsar/scripts/watch-znode.py
@@ -26,18 +26,21 @@ from kazoo.retry import KazooRetry
 logging.getLogger('kazoo.client').addHandler(logging.StreamHandler())
 
 def usage():
-    print("\n%s -z <zookeeper> -p <path> [-w|-c|-e]" % (sys.argv[0]), file=sys.stderr)
-    print("\nWait for, or create znode", file=sys.stderr)
-    print("\n-z Specify zookeeper connect string", file=sys.stderr)
-    print("\n-p Znode path to watch or create", file=sys.stderr)
-    print("\n-w Watch for path creation", file=sys.stderr)
-    print("\n-c Create path", file=sys.stderr)
-    print("\n-e Check if znode exists", file=sys.stderr)
+    sys.stderr.write('''
+%s -z <zookeeper> -p <path> [-w|-c|-e]
+
+Wait for, or create znode
+  -z Specify zookeeper connect string
+  -p Znode path to watch or create
+  -w Watch for path creation
+  -c Create path
+  -e Check if znode exists
+''' % (sys.argv[0]))
 
 try:
     opts, args = getopt.getopt(sys.argv[1:], "z:p:cweh")
 except getopt.GetoptError as err:
-    print(str(err), file=sys.stderr)
+    sys.stderr.write(str(err) + '\n')
     usage()
     sys.exit(2)
 
@@ -67,17 +70,17 @@ for o, a in opts:
         sys.exit(2)
 
 if not zookeeper:
-    print("Zookeeper must be specified", file=sys.stderr)
+    sys.stderr.write("Zookeeper must be specified\n")
     usage()
     sys.exit(3)
 
 if not znode:
-    print("Znode must be specified", file=sys.stderr)
+    sys.stderr.write("Znode must be specified\n")
     usage()
     sys.exit(4)
 
 if (not watch and not create and not exists):
-    print("Exactly one of watch (-w), create (-c) or exists (-e) must be specified", file=sys.stderr)
+    sys.stderr.write("Exactly one of watch (-w), create (-c) or exists (-e) must be specified\n")
     usage()
     sys.exit(5)