updated hbase_compact_tables.py

HariSekhon · HariSekhon · commit acedcf75cdc5 · 2016-10-15T13:41:59.000+01:00
diff --git a/hbase_compact_tables.py b/hbase_compact_tables.py
@@ -42,9 +42,15 @@
 try:
     # pylint: disable=wrong-import-position
     import happybase  # pylint: disable=unused-import
-    # weird this is only importable after happybase, must global implicit import
     # happybase.hbase.ttypes.IOError no longer there in Happybase 1.0
-    from Hbase_thrift import IOError as HBaseIOError  # pylint: disable=import-error
+    try:
+        # this is only importable after happybase module
+        # pylint: disable=import-error
+        from Hbase_thrift import IOError as HBaseIOError
+    except ImportError:
+        # probably Happybase <= 0.9
+        # pylint: disable=import-error,no-name-in-module,ungrouped-imports
+        from happybase.hbase.ttypes import IOError as HBaseIOError
     from thriftpy.thrift import TException as ThriftException
 except ImportError as _:
     print('Happybase / thrift module import error - did you forget to build this project?\n\n'
@@ -63,7 +69,7 @@
     sys.exit(4)
 
 __author__ = 'Hari Sekhon'
-__version__ = '0.3'
+__version__ = '0.4'
 
 
 class HBaseCompactTables(CLI):
