X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Fsfatime.py;h=487968928a1cdc82b7e5e0b459b0a2cde8138e7d;hb=7a1d34a07426961f0d08aeda0e8fe8c8b5caa4f6;hp=34f4dce9a9fba783d1d75daef76de954c9ca9263;hpb=d332e5a4e554961aedb715a06d79c890fdd06f88;p=sfa.git diff --git a/sfa/util/sfatime.py b/sfa/util/sfatime.py index 34f4dce9..48796892 100644 --- a/sfa/util/sfatime.py +++ b/sfa/util/sfatime.py @@ -1,3 +1,25 @@ +#---------------------------------------------------------------------- +# Copyright (c) 2008 Board of Trustees, Princeton University +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and/or hardware specification (the "Work") to +# deal in the Work without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Work, and to permit persons to whom the Work +# is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Work. +# +# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS +# IN THE WORK. +#---------------------------------------------------------------------- from types import StringTypes import dateutil.parser import datetime @@ -13,14 +35,14 @@ the timezone, so that it's compatible with normal datetime.datetime objects. For safety this can also handle inputs that are either timestamps, or datetimes """ - # perpare the input for the checks below by + # prepare the input for the checks below by # casting strings ('1327098335') to ints if isinstance(input, StringTypes): try: input = int(input) except ValueError: pass - + if isinstance (input, datetime.datetime): logger.warn ("argument to utcparse already a datetime - doing nothing") return input @@ -38,10 +60,7 @@ def datetime_to_string(input): return datetime.datetime.strftime(input, DATEFORMAT) def datetime_to_utc(input): - return time.gmtime(datetime_to_epoch(input)) + return time.gmtime(datetime_to_epoch(input)) def datetime_to_epoch(input): return int(time.mktime(input.timetuple())) - - -