.

wcfs/testprog/treegen.py

@@ -78,7 +78,7 @@ XXX
 
 from __future__ import print_function, absolute_import
 
-import os, sys
+import sys
 from golang import func, defer, panic
 from golang import time
 from ZODB import DB
@@ -86,6 +86,7 @@ from ZODB.Connection import Connection
 from ZODB.MappingStorage import MappingStorage
 import transaction
 import random
+import six
 
 from wendelin.wcfs.internal import xbtree, xbtree_test
 from wendelin.bigfile.file_zodb import ZBlk
@@ -417,15 +418,11 @@ def xreadlines(r):
 @func
 def cmd_allstructs(argv):
     if len(argv) != 5:
-        print("Usage: treegen allstructs <maxdepth> <maxsplit> <n> <kv1> <kv2>", file=sys.stderr)
+        print("Usage: treegen allstructs <maxdepth> <maxsplit> <n>(/<seed>) <kv1> <kv2>", file=sys.stderr)
         sys.exit(1)
 
-    maxdepth = int(argv[0])
-    maxsplit = int(argv[1])
-    n        = int(argv[2]) # XXX -> nsample?
-    kv1, kv2 = argv[3:]
-    seed = os.environ.get("treegen_SEED")
-    AllStructs(kv1, kv2, maxdepth, maxsplit, n, seed)
+    r = six.StringIO(' '.join(argv))
+    AllStructsSrv(r)
 
 @func
 def cmd_allstructs_srv(argv):