Port utils_common.py from old driver version

rethinkdb · Sep 17, 2023 · 847ebde · 847ebde
1 parent 2fba967
commit 847ebde
Show file tree

Hide file tree

Showing 6 changed files with 484 additions and 8 deletions.
diff --git a/rethinkdb/cli/_dump.py b/rethinkdb/cli/_dump.py
@@ -30,8 +30,7 @@
 import time
 import traceback
 
-from rethinkdb import utils_common
-from rethinkdb.cli import _export
+from rethinkdb.cli import utils_common, _export
 # from rethinkdb.logger import default_logger
 
 

diff --git a/rethinkdb/cli/_export.py b/rethinkdb/cli/_export.py
@@ -37,7 +37,8 @@
 
 from multiprocessing.queues import SimpleQueue
 
-from rethinkdb import errors, query, utils_common
+from rethinkdb import errors, query
+from rethinkdb.cli import utils_common
 # from rethinkdb.logger import default_logger
 
 # STATIC INFORMATION ABOUT THE EXOIRT FEATURE

diff --git a/rethinkdb/cli/_import.py b/rethinkdb/cli/_import.py
@@ -32,11 +32,13 @@
 import sys
 import time
 import traceback
-from multiprocessing.queues import Queue, SimpleQueue
+# Unused. Delete if all tests pass even when commented
+# from multiprocessing.queues import Queue, SimpleQueue
 
 import six
 
-from rethinkdb import ast, errors, query, utils_common
+from rethinkdb import ast, errors, query
+from rethinkdb.cli import utils_common
 # from rethinkdb.logger import default_logger
 
 try:

diff --git a/rethinkdb/cli/_index_rebuild.py b/rethinkdb/cli/_index_rebuild.py
@@ -27,7 +27,8 @@
 import time
 import traceback
 
-from rethinkdb import query, utils_common
+from rethinkdb import query
+from rethinkdb.cli import utils_common
 
 usage = (
     "rethinkdb index-rebuild [-c HOST:PORT] [-n NUM] "

diff --git a/rethinkdb/cli/_restore.py b/rethinkdb/cli/_restore.py
@@ -31,8 +31,7 @@
 import time
 import traceback
 
-from rethinkdb import utils_common
-from rethinkdb.cli import _import
+from rethinkdb import utils_common, _import
 
 usage = (
     "rethinkdb restore FILE [-c HOST:PORT] [--tls-cert FILENAME] [-p] [--password-file FILENAME] [--clients NUM] "