Merge branch '15888-remove-py2-from-test' into master

[arvados.git] / sdk / python / bin / arv-ws

diff --git a/sdk/python/bin/arv-ws b/sdk/python/bin/arv-ws
index 07216879a95f25df51039e575d89c532fd5622be..2b601296b483fcdda544e7f049d490659d4b0099 100755 (executable)
--- a/sdk/python/bin/arv-ws
+++ b/sdk/python/bin/arv-ws
@@ -1,34 +1,7 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
 
-import argparse
-import sys
-
-parser = argparse.ArgumentParser()
-parser.add_argument('-u', '--uuid', type=str, default="")
-args = parser.parse_args()
-
-def on_message(ev):
-  print "\n", ev
-
-filters = []
-if len(args.uuid)>0:
-  filter1 = []
-  filter1.append ('object_uuid')
-  filter1.append ('=')
-  filter1.append (args.uuid)
-  filters.append (filter1)
-
-import arvados
-from arvados.events import subscribe
-
-api = arvados.api('v1', cache=False)
-
-ws = None
-try:
-  ws = subscribe(api, filters, lambda ev: on_message(ev))
-  ws.run_forever()
-except:
-  if (ws):
-    ws.close_connection()
-  else:
-    sys.exc_info()
+from arvados.commands.ws import main
+main()