Merge pull request #21 from esnet/int-or-long

Int or long in Event.timestamp_from_arg()
esnet · Oct 3, 2016 · 3de1c7b · 3de1c7b
2 parents ff17c63 + fe4303f
commit 3de1c7b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -78,9 +78,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.4.7'
+version = '0.4.8'
 # The full version, including alpha/beta/rc tags.
-release = '0.4.7'
+release = '0.4.8'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/pypond/event.py b/pypond/event.py
@@ -252,7 +252,7 @@ def timestamp_from_arg(arg):
         EventException
             Does not accept unaware datetime objects.
         """
-        if isinstance(arg, int):
+        if isinstance(arg, six.integer_types):
             return dt_from_ms(arg)
         elif isinstance(arg, datetime.datetime):
             if not dt_is_aware(arg):

diff --git a/setup.py b/setup.py
@@ -22,7 +22,7 @@
 
 setup(
     name='pypond',
-    version='0.4.7',
+    version='0.4.8',
     description='Python implementation of the Pond JavaScript timeseries library (https://github.com/esnet/pond).',  # pylint: disable=line-too-long
     long_description=DESCRIPTION,
     author='Monte M. Goode',