[ovs-dev] [python 3/7] stream.py: Make usage() function return a string.
Ethan Jackson
ethan at nicira.com
Tue Sep 27 21:35:31 UTC 2011
This will marginally simplify a future patch.
___
Here's another version.
---
python/ovs/stream.py | 18 +++++++-----------
tests/test-jsonrpc.py | 2 +-
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/python/ovs/stream.py b/python/ovs/stream.py
index 5180642..3bb0c10 100644
--- a/python/ovs/stream.py
+++ b/python/ovs/stream.py
@@ -302,14 +302,10 @@ class PassiveStream(object):
self.socket.close()
-def usage(name, active, passive):
- print
- if active:
- print("Active %s connection methods:" % name)
- print(" unix:FILE "
- "Unix domain socket named FILE")
-
- if passive:
- print("Passive %s connection methods:" % name)
- print(" punix:FILE "
- "listen on Unix domain socket FILE")
+def usage(name):
+ return """
+Active %s connection methods:
+ unix:FILE Unix domain socket named FILE
+
+Passive %s connection methods:
+ punix:FILE Listen on Unix domain socket FILE""" % (name, name)
diff --git a/tests/test-jsonrpc.py b/tests/test-jsonrpc.py
index 9da3bd2..5ce45ad 100644
--- a/tests/test-jsonrpc.py
+++ b/tests/test-jsonrpc.py
@@ -212,7 +212,7 @@ usage: %s [OPTIONS] COMMAND [ARG...]
request REMOTE METHOD PARAMS send request, print reply
notify REMOTE METHOD PARAMS send notification and exit
""" % (ovs.util.PROGRAM_NAME, ovs.util.PROGRAM_NAME))
- ovs.stream.usage("JSON-RPC", True, True)
+ sys.stdout.write(ovs.stream.usage("JSON-RPC") + "\n")
ovs.daemon.usage()
sys.stdout.write("""
Other options:
--
1.7.6.1
More information about the dev
mailing list