Python 3 Compatibility (Part 2)

Makefile

@@ -8,12 +8,25 @@ doc:
 	@echo Generated documentation: "file://"$$(readlink -f doc/build/html/index.html)
 	@echo
 
+doc3:
+	python3 setup.py build_sphinx
+	@echo
+	@echo Generated documentation: "file://"$$(readlink -f doc/build/html/index.html)
+	@echo
+
 test:
 	-find coverage/ -mindepth 1 -delete
 	python $$(which nosetests) $${TESTS}
 
+test3:
+	-find coverage/ -mindepth 1 -delete
+	python3 $$(which nosetests3) $${TESTS}
+
 clean:
 	find . -name '*.py[co]' -delete
 
 dist: test
 	python setup.py sdist
+
+dist3: test3
+	python3 setup.py sdist

TODO.rst

@@ -16,9 +16,3 @@ future, depending on time, demand, and technical possibilities.
 * Port HappyBase over to the (still experimental) HBase Thrift2 API when it
   becomes mainstream, and expose more of the underlying features nicely in the
   HappyBase API.
-
-* Python 3 support. This would be trivial for HappyBase, now that the
-  underlying Thrift library is Python 3 compatible. `Track`_ this
-  issue online.
-
-.. _Track: https://github.com/wbolster/happybase/issues/40

doc/conf.py

@@ -11,7 +11,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import imp
+from os.path import dirname, join
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -48,11 +49,13 @@
 # built documents.
 #
 # The short X.Y version.
-execfile(os.path.join(os.path.dirname(__file__), '../happybase/_version.py'))
-version = __version__
+
+version_path = join(dirname(__file__), '../happybase/_version.py')
+with open(version_path) as fp:
+    version = imp.load_source("_version", version_path, fp).__version__
 
 # The full version, including alpha/beta/rc tags.
-release = __version__
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

happybase/Hbase.thrift

@@ -75,7 +75,7 @@ struct ColumnDescriptor {
   6:i32 bloomFilterVectorSize = 0,
   7:i32 bloomFilterNbHashes = 0,
   8:bool blockCacheEnabled = 0,
-  9:i32 timeToLive = -1
+  9:i32 timeToLive = 0x7fffffff
 }
 
 /**
@@ -906,22 +906,6 @@ service Hbase {
     1:ScannerID id
   ) throws (1:IOError io, 2:IllegalArgument ia)
 
-  /**
-   * Get the row just before the specified one.
-   *
-   * @return value for specified row/column
-   */
-  list<TCell> getRowOrBefore(
-    /** name of table */
-    1:Text tableName,
-
-    /** row key */
-    2:Text row,
-
-    /** column name */
-    3:Text family
-  ) throws (1:IOError io)
-
   /**
    * Get the regininfo for the specified row. It scans
    * the metatable to find region's start and end keys.

happybase/batch.py

@@ -45,7 +45,7 @@ def _reset_mutations(self):
 
     def send(self):
         """Send the batch to the server."""
-        bms = [BatchMutation(row, m) for row, m in self._mutations.iteritems()]
+        bms = [BatchMutation(row, m) for row, m in self._mutations.items()]
         if not bms:
             return
 
@@ -80,7 +80,7 @@ def put(self, row, data, wal=None):
                 column=column,
                 value=value,
                 writeToWAL=wal)
-            for column, value in data.iteritems())
+            for column, value in data.items())
 
         self._mutation_count += len(data)
         if self._batch_size and self._mutation_count >= self._batch_size:

happybase/connection.py

@@ -33,7 +33,6 @@
 DEFAULT_COMPAT = '0.96'
 DEFAULT_PROTOCOL = 'binary'
 
-
 class Connection(object):
     """Connection to an HBase Thrift server.
 
@@ -97,26 +96,26 @@ class Connection(object):
     :param int port: The port to connect to
     :param int timeout: The socket timeout in milliseconds (optional)
     :param bool autoconnect: Whether the connection should be opened directly
-    :param str table_prefix: Prefix used to construct table names (optional)
-    :param str table_prefix_separator: Separator used for `table_prefix`
+    :param bytes table_prefix: Prefix used to construct table names (optional)
+    :param bytes table_prefix_separator: Separator used for `table_prefix`
     :param str compat: Compatibility mode (optional)
     :param str transport: Thrift transport mode (optional)
     """
     def __init__(self, host=DEFAULT_HOST, port=DEFAULT_PORT, timeout=None,
                  autoconnect=True, table_prefix=None,
-                 table_prefix_separator='_', compat=DEFAULT_COMPAT,
+                 table_prefix_separator=b'_', compat=DEFAULT_COMPAT,
                  transport=DEFAULT_TRANSPORT, protocol=DEFAULT_PROTOCOL):
 
         if transport not in THRIFT_TRANSPORTS:
             raise ValueError("'transport' must be one of %s"
                              % ", ".join(THRIFT_TRANSPORTS.keys()))
 
         if table_prefix is not None \
-                and not isinstance(table_prefix, basestring):
-            raise TypeError("'table_prefix' must be a string")
+                and not isinstance(table_prefix, bytes):
+            raise TypeError("'table_prefix' must be a byte string")
 
-        if not isinstance(table_prefix_separator, basestring):
-            raise TypeError("'table_prefix_separator' must be a string")
+        if not isinstance(table_prefix_separator, bytes):
+            raise TypeError("'table_prefix_separator' must be a byte string")
 
         if compat not in COMPAT_MODES:
             raise ValueError("'compat' must be one of %s"
@@ -213,7 +212,7 @@ def table(self, name, use_prefix=True):
         argument to the :py:class:`Connection` constructor for more
         information.
 
-        :param str name: the name of the table
+        :param bytes name: the name of the table
         :param bool use_prefix: whether to use the table prefix (if any)
         :return: Table instance
         :rtype: :py:class:`Table`
@@ -233,13 +232,13 @@ def tables(self):
         tables that have the specified prefix will be listed.
 
         :return: The table names
-        :rtype: List of strings
+        :rtype: List of byte strings
         """
         names = self.client.getTableNames()
 
         # Filter using prefix, and strip prefix from names
         if self.table_prefix is not None:
-            prefix = self._table_name('')
+            prefix = self._table_name(b'')
             offset = len(prefix)
             names = [n[offset:] for n in names if n.startswith(prefix)]
 
@@ -248,7 +247,7 @@ def tables(self):
     def create_table(self, name, families):
         """Create a table.
 
-        :param str name: The table name
+        :param bytes name: The table name
         :param dict families: The name and options for each column family
 
         The `families` argument is a dictionary mapping column family
@@ -288,16 +287,16 @@ def create_table(self, name, families):
                 % name)
 
         column_descriptors = []
-        for cf_name, options in families.iteritems():
+        for cf_name, options in families.items():
             if options is None:
                 options = dict()
 
             kwargs = dict()
-            for option_name, value in options.iteritems():
+            for option_name, value in options.items():
                 kwargs[pep8_to_camel_case(option_name)] = value
 
-            if not cf_name.endswith(':'):
-                cf_name += ':'
+            if not cf_name.endswith(b':'):
+                cf_name += b':'
             kwargs['name'] = cf_name
 
             column_descriptors.append(ColumnDescriptor(**kwargs))
@@ -314,7 +313,7 @@ def delete_table(self, name, disable=False):
         deleted. If the `disable` argument is `True`, this method first
         disables the table if it wasn't already and then deletes it.
 
-        :param str name: The table name
+        :param bytes name: The table name
         :param bool disable: Whether to first disable the table if needed
         """
         if disable and self.is_table_enabled(name):
@@ -326,23 +325,23 @@ def delete_table(self, name, disable=False):
     def enable_table(self, name):
         """Enable the specified table.
 
-        :param str name: The table name
+        :param bytes name: The table name
         """
         name = self._table_name(name)
         self.client.enableTable(name)
 
     def disable_table(self, name):
         """Disable the specified table.
 
-        :param str name: The table name
+        :param bytes name: The table name
         """
         name = self._table_name(name)
         self.client.disableTable(name)
 
     def is_table_enabled(self, name):
         """Return whether the specified table is enabled.
 
-        :param str name: The table name
+        :param bytes name: The table name
 
         :return: whether the table is enabled
         :rtype: bool
@@ -353,7 +352,7 @@ def is_table_enabled(self, name):
     def compact_table(self, name, major=False):
         """Compact the specified table.
 
-        :param str name: The table name
+        :param bytes name: The table name
         :param bool major: Whether to perform a major compaction.
         """
         name = self._table_name(name)