Make files Py3 only compatible

Author: Gábor Boros

rethinkdb/__init__.py

@@ -11,20 +11,15 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# The builtins here defends against re-importing something obscuring `object`.
+import builtins
 import imp
 import os
 
 import pkg_resources
 
 from rethinkdb import errors, version
 
-# The builtins here defends against re-importing something obscuring `object`.
-try:
-    import __builtin__ as builtins  # Python 2
-except ImportError:
-    import builtins  # Python 3
-
-
 __all__ = ["RethinkDB"] + errors.__all__
 __version__ = version.VERSION
 

rethinkdb/_dump.py

@@ -20,7 +20,6 @@
 
 """`rethinkdb-dump` creates an archive of data from a RethinkDB cluster"""
 
-from __future__ import print_function
 
 import datetime
 import os

rethinkdb/_export.py

@@ -17,7 +17,6 @@
 # This file incorporates work covered by the following copyright:
 # Copyright 2010-2016 RethinkDB, all rights reserved.
 
-from __future__ import print_function
 
 import csv
 import ctypes
@@ -41,9 +40,9 @@
 from rethinkdb.logger import default_logger
 
 try:
-    unicode
+    str
 except NameError:
-    unicode = str
+    str = str
 
 
 usage = """rethinkdb export [-c HOST:PORT] [-p] [--password-file FILENAME] [--tls-cert filename] [-d DIR]
@@ -244,13 +243,8 @@ def csv_writer(filename, fields, delimiter, task_queue, error_queue):
                         info.append(str(row[field]))
                     elif isinstance(row[field], str):
                         info.append(row[field])
-                    elif isinstance(row[field], unicode):
-                        info.append(row[field].encode("utf-8"))
                     else:
-                        if str == unicode:
-                            info.append(json.dumps(row[field]))
-                        else:
-                            info.append(json.dumps(row[field]).encode("utf-8"))
+                        info.append(json.dumps(row[field]))
                 out_writer.writerow(info)
                 item = task_queue.get()
     except BaseException:

rethinkdb/_import.py

@@ -19,7 +19,6 @@
 
 """`rethinkdb import` loads data into a RethinkDB cluster"""
 
-from __future__ import print_function
 
 import codecs
 import collections
@@ -34,23 +33,13 @@
 import time
 import traceback
 from multiprocessing.queues import Queue, SimpleQueue
+from queue import Empty, Full
 
 import six
 
 from rethinkdb import ast, errors, query, utils_common
 from rethinkdb.logger import default_logger
 
-try:
-    unicode
-except NameError:
-    unicode = str
-
-try:
-    from Queue import Empty, Full
-except ImportError:
-    from queue import Empty, Full
-
-
 # json parameters
 JSON_READ_CHUNK_SIZE = 128 * 1024
 JSON_MAX_BUFFER_SIZE = 128 * 1024 * 1024
@@ -125,8 +114,8 @@ def __init__(
 
         # source
         if hasattr(source, "read"):
-            if unicode != str or "b" in source.mode:
-                # Python2.x or binary file, assume utf-8 encoding
+            if "b" in source.mode:
+                # binary file, assume utf-8 encoding
                 self._source = codecs.getreader("utf-8")(source)
             else:
                 # assume that it has the right encoding on it
@@ -277,7 +266,7 @@ def setup_table(self):
                     query.row,
                     **self.source_options["create_args"]
                     if "create_args" in self.source_options
-                    else {}
+                    else {},
                 )
             ),
         )
@@ -657,12 +646,7 @@ def byte_counter(self):
 
         for line in self._source:
             self._bytes_read.value += len(line)
-            if unicode != str:
-                yield line.encode(
-                    "utf-8"
-                )  # Python2.x csv module does not really handle unicode
-            else:
-                yield line
+            yield line
 
     def setup_file(self, warning_queue=None):
         # - setup csv.reader with a byte counter wrapper
@@ -699,7 +683,7 @@ def get_line(self):
             # treat empty fields as no entry rather than empty string
             if value == "":
                 continue
-            row[key] = value if str == unicode else unicode(value, encoding="utf-8")
+            row[key] = value
 
         return row
 

rethinkdb/_index_rebuild.py

@@ -22,7 +22,6 @@
   This should be used after upgrading to a newer version of rethinkdb.  There
   will be a notification in the web UI if any secondary indexes are out-of-date."""
 
-from __future__ import print_function
 
 import sys
 import time

rethinkdb/_restore.py

@@ -20,7 +20,6 @@
 
 """`rethinkdb restore` loads data into a RethinkDB cluster from an archive"""
 
-from __future__ import print_function
 
 import copy
 import multiprocessing

rethinkdb/ast.py

@@ -30,16 +30,6 @@
 
 P_TERM = ql2_pb2.Term.TermType
 
-try:
-    unicode
-except NameError:
-    unicode = str
-
-try:
-    xrange
-except NameError:
-    xrange = range
-
 
 def dict_items(dictionary):
     return list(dictionary.items())
@@ -101,7 +91,7 @@ def expr(val, nesting_depth=20):
         return ISO8601(val.isoformat())
     elif isinstance(val, RqlBinary):
         return Binary(val)
-    elif isinstance(val, (str, unicode)):
+    elif isinstance(val, str):
         return Datum(val)
     elif isinstance(val, bytes):
         return Binary(val)
@@ -635,7 +625,7 @@ def set_infix(self):
     def compose(self, args, optargs):
         t_args = [
             T("r.expr(", args[i], ")") if needs_wrap(self._args[i]) else args[i]
-            for i in xrange(len(args))
+            for i in range(len(args))
         ]
 
         if self.infix:
@@ -648,7 +638,7 @@ class RqlBiOperQuery(RqlQuery):
     def compose(self, args, optargs):
         t_args = [
             T("r.expr(", args[i], ")") if needs_wrap(self._args[i]) else args[i]
-            for i in xrange(len(args))
+            for i in range(len(args))
         ]
         return T("(", T(*t_args, intsp=[" ", self.statement, " "]), ")")
 
@@ -901,7 +891,7 @@ class MakeObj(RqlQuery):
     def __init__(self, obj_dict):
         super(MakeObj, self).__init__()
         for key, value in dict_items(obj_dict):
-            if not isinstance(key, (str, unicode)):
+            if not isinstance(key, str):
                 raise ReqlDriverCompileError("Object keys must be strings.")
             self.optargs[key] = expr(value)
 
@@ -913,7 +903,7 @@ def compose(self, args, optargs):
             "r.expr({",
             T(
                 *[T(repr(key), ": ", value) for key, value in dict_items(optargs)],
-                intsp=", "
+                intsp=", ",
             ),
             "})",
         )
@@ -1712,7 +1702,7 @@ def __new__(cls, *args, **kwargs):
 
     def __repr__(self):
         excerpt = binascii.hexlify(self[0:6]).decode("utf-8")
-        excerpt = " ".join([excerpt[i : i + 2] for i in xrange(0, len(excerpt), 2)])
+        excerpt = " ".join([excerpt[i : i + 2] for i in range(0, len(excerpt), 2)])
         excerpt = (
             ", '%s%s'" % (excerpt, "..." if len(self) > 6 else "")
             if len(self) > 0
@@ -1737,7 +1727,7 @@ def __init__(self, data):
         # Python 3 - `unicode` is equivalent to `str`, neither will be accepted
         if isinstance(data, RqlQuery):
             RqlTopLevelQuery.__init__(self, data)
-        elif isinstance(data, unicode):
+        elif isinstance(data, str):
             raise ReqlDriverCompileError(
                 "Cannot convert a unicode string to binary, "
                 "use `unicode.encode()` to specify the "
@@ -1956,11 +1946,9 @@ def __init__(self, lmbd):
         super(Func, self).__init__()
         vrs = []
         vrids = []
-        try:
-            code = lmbd.func_code
-        except AttributeError:
-            code = lmbd.__code__
-        for i in xrange(code.co_argcount):
+        code = lmbd.__code__
+
+        for i in range(code.co_argcount):
             Func.lock.acquire()
             var_id = Func.nextVarId
             Func.nextVarId += 1
@@ -1976,7 +1964,7 @@ def compose(self, args, optargs):
             "lambda ",
             T(
                 *[v.compose([v._args[0].compose(None, None)], []) for v in self.vrs],
-                intsp=", "
+                intsp=", ",
             ),
             ": ",
             args[1],

rethinkdb/docs.py

@@ -190,7 +190,7 @@
         b"cursor.close()\n\nClose a cursor. Closing a cursor cancels the corresponding query and frees the memory\nassociated with the open request.\n\n*Example* Close a cursor.\n\n    cursor.close()\n",
     ),
     (
-        rethinkdb.net.Cursor.next,
+        rethinkdb.net.Cursor.__next__,
         b"cursor.next([wait=True])\n\nGet the next element in the cursor.\n\nThe optional `wait` argument specifies whether to wait for the next available element and how long to wait:\n\n* `True`: Wait indefinitely (the default).\n* `False`: Do not wait at all. If data is immediately available, it will be returned; if it is not available, a `ReqlTimeoutError` will be raised.\n* number: Wait up to the specified number of seconds for data to be available before raising `ReqlTimeoutError`.\n\nThe behavior of `next` will be identical with `False`, `None` or the number `0`.\n\nCalling `next` the first time on a cursor provides the first element of the cursor. If the data set is exhausted (e.g., you have retrieved all the documents in a table), a `ReqlCursorEmpty` error will be raised when `next` is called.\n\n*Example* Retrieve the next element.\n\n    cursor = r.table('superheroes').run(conn)\n    doc = cursor.next()\n\n*Example* Retrieve the next element on a [changefeed](http://rethinkdb.com/docs/changefeeds/python), waiting up to five seconds.\n\n    cursor = r.table('superheroes').changes().run(conn)\n    doc = cursor.next(wait=5)\n\n__Note:__ RethinkDB sequences can be iterated through via the Python Iterable interface. The canonical way to retrieve all the results is to use a [for...in](../each/) loop or [list()](../to_array/).\n\n",
     ),
     (

rethinkdb/errors.py

@@ -44,38 +44,13 @@
     "RqlTimeoutError",
 ]
 
-import sys
-
-try:
-    unicode
-
-    def convertForPrint(inputString):
-        if isinstance(inputString, unicode):  # noqa: F821
-            encoding = "utf-8"
-            if hasattr(sys.stdout, "encoding") and sys.stdout.encoding:
-                encoding = sys.stdout.encoding
-            return inputString.encode(encoding or "utf-8", "replace")
-        else:
-            return str(inputString)
-
-
-except NameError:
-
-    def convertForPrint(inputString):
-        return inputString
-
-
-try:
-    {}.iteritems
-
-    def dict_items(d):
-        return d.iteritems()
 
+def convertForPrint(inputString):
+    return inputString
 
-except AttributeError:
 
-    def dict_items(d):
-        return d.items()
+def dict_items(d):
+    return list(d.items())
 
 
 class ReqlCursorEmpty(Exception):

rethinkdb/handshake.py

@@ -31,11 +31,6 @@
 from rethinkdb.helpers import chain_to_bytes, decode_utf8
 from rethinkdb.logger import default_logger
 
-try:
-    xrange
-except NameError:
-    xrange = range
-
 
 def compare_digest(digest_a, digest_b):
     if sys.version_info[0] == 3:
@@ -96,7 +91,7 @@ def digest(msg, mac=mac):
 
     t = digest(salt + b"\x00\x00\x00\x01")
     u = from_bytes(t)
-    for c in xrange(iterations - 1):
+    for c in range(iterations - 1):
         t = digest(t)
         u ^= from_bytes(t)
 
@@ -339,7 +334,7 @@ def _prepare_auth_request(self, response):
                     struct.unpack("32B", client_key),
                     struct.unpack("32B", client_signature),
                 )
-            )
+            ),
         )
 
         authentication_request = chain_to_bytes(