Also allow 'long' type for 'timestamp' args

Fixes issue #23.

happybase/batch.py

@@ -4,6 +4,7 @@
 
 from collections import defaultdict
 import logging
+from numbers import Integral
 
 from .hbase.ttypes import BatchMutation, Mutation
 
@@ -19,7 +20,7 @@ class Batch(object):
     def __init__(self, table, timestamp=None, batch_size=None,
                  transaction=False):
         """Initialise a new Batch instance."""
-        if not (timestamp is None or isinstance(timestamp, int)):
+        if not (timestamp is None or isinstance(timestamp, Integral)):
             raise TypeError("'timestamp' must be an integer or None")
 
         if batch_size is not None:

happybase/table.py

@@ -3,6 +3,7 @@
 """
 
 import logging
+from numbers import Integral
 from operator import attrgetter
 from struct import Struct
 
@@ -104,7 +105,7 @@ def row(self, row, columns=None, timestamp=None, include_timestamp=False):
             rows = self.connection.client.getRowWithColumns(
                 self.name, row, columns)
         else:
-            if not isinstance(timestamp, int):
+            if not isinstance(timestamp, Integral):
                 raise TypeError("'timestamp' must be an integer")
             rows = self.connection.client.getRowWithColumnsTs(
                 self.name, row, columns, timestamp)
@@ -144,7 +145,7 @@ def rows(self, rows, columns=None, timestamp=None,
             results = self.connection.client.getRowsWithColumns(
                 self.name, rows, columns)
         else:
-            if not isinstance(timestamp, int):
+            if not isinstance(timestamp, Integral):
                 raise TypeError("'timestamp' must be an integer")
 
             # Work-around a bug in the HBase Thrift server where the
@@ -192,7 +193,7 @@ def cells(self, row, column, versions=None, timestamp=None,
             cells = self.connection.client.getVer(
                 self.name, row, column, versions)
         else:
-            if not isinstance(timestamp, int):
+            if not isinstance(timestamp, Integral):
                 raise TypeError("'timestamp' must be an integer")
             cells = self.connection.client.getVerTs(
                 self.name, row, column, timestamp, versions)

tests/test_api.py

@@ -146,6 +146,7 @@ def test_families():
 def test_put():
     table.put('r1', {'cf1:c1': 'v1', 'cf1:c2': 'v2', 'cf2:c3': 'v3'})
     table.put('r1', {'cf1:c4': 'v2'}, timestamp=2345678)
+    table.put('r1', {'cf1:c4': 'v2'}, timestamp=1369168852994L)
 
 
 def test_atomic_counters():