X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfa%2Futil%2Fsfatime.py;h=6793ad57e6c91b3af9b56d0a308fb0675dde60c3;hp=9752d325c7929d4c9983c274caf75bc995b5f285;hb=4a9e6751f9f396f463932133b9d62fc925a99ef6;hpb=648ac3fd865ea29425485f26eb0a7bf1a62281e0 diff --git a/sfa/util/sfatime.py b/sfa/util/sfatime.py index 9752d325..6793ad57 100644 --- a/sfa/util/sfatime.py +++ b/sfa/util/sfatime.py @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS # IN THE WORK. #---------------------------------------------------------------------- -from __future__ import print_function + import time import datetime @@ -80,7 +80,7 @@ For safety this can also handle inputs that are either timestamps, or datetimes if t.utcoffset() is not None: t = t.utcoffset() + t.replace(tzinfo=None) return t - elif isinstance(input, (int, float, long)): + elif isinstance(input, (int, float)): return datetime.datetime.fromtimestamp(input) else: logger.error("Unexpected type in utcparse [%s]" % type(input))