diff --git a/gracedb/core/utils.py b/gracedb/core/utils.py index 40fe4e781b345798815dbc919ec7ace070692d48..0c629ea0eaff4398c481e3ae16588ed9139d6b68 100644 --- a/gracedb/core/utils.py +++ b/gracedb/core/utils.py @@ -19,7 +19,7 @@ def int_to_letters(num, positive_only=True): """ # Argument checking - if not isinstance(num, (int, long)): + if not isinstance(num, int): # Coerce to int logger.warning('Coercing argument of type {0} to int'.format( type(num))) diff --git a/gracedb/events/templatetags/timeutil.py b/gracedb/events/templatetags/timeutil.py index dc72a5c95f57176622db1e47680bd00567f1255e..95fdf8b6251d83c77454e77419a1e55e824becb2 100644 --- a/gracedb/events/templatetags/timeutil.py +++ b/gracedb/events/templatetags/timeutil.py @@ -53,7 +53,7 @@ def get_multitime_value(t, label, autoescape, format): dt = dt.astimezone(SERVER_TZ) posix_time = time.mktime(dt.timetuple()) gps_time = int(posixToGpsTime(posix_time)) - elif isinstance(t, int) or isinstance(t, long): + elif isinstance(t, int): gps_time = t dt = gpsToUtc(t) # Note: must convert to server timezone before calling mktime @@ -66,7 +66,7 @@ def get_multitime_value(t, label, autoescape, format): return "N/A" return '<time utc="%s" gps="%s" llo="%s" lho="%s" virgo="%s" jsparsable="%s"%s>%s</time>' % \ 8*("N/A",) - # raise ValueError("time must be type int, long or datetime, not '%s'" % type(t)) + # raise ValueError("time must be type int or datetime, not '%s'" % type(t)) # JavaScript -- parsable by Date() object constructor # "Jan 2, 1985 00:00:00 UTC" @@ -167,7 +167,7 @@ def timeSelections(t): dt = dt.astimezone(SERVER_TZ) posix_time = time.mktime(dt.timetuple()) gps_time = int(posixToGpsTime(posix_time)) - elif isinstance(t, int) or isinstance(t, long): + elif isinstance(t, int): gps_time = t dt = gpsToUtc(t) posix_time = time.mktime(dt.astimezone(SERVER_TZ).timetuple()) @@ -176,7 +176,7 @@ def timeSelections(t): dt = gpsToUtc(t) posix_time = time.mktime(dt.astimezone(SERVER_TZ).timetuple()) else: - raise ValueError("time must be type int, long or datetime, not '%s'" % type(t)) + raise ValueError("time must be type int or datetime, not '%s'" % type(t)) # JavaScript -- parsable by Date() object constructor # "Jan 2, 1985 00:00:00 UTC" diff --git a/gracedb/events/views.py b/gracedb/events/views.py index 7a981ddef472463e425bcf572b03a9b4d0532055..c79206a1ba660825433d97d16f538f4eb337f65f 100644 --- a/gracedb/events/views.py +++ b/gracedb/events/views.py @@ -323,13 +323,13 @@ def logentry(request, event, num=None): def neighbors(request, event, delta1, delta2=None): context = {} try: - delta1 = long(delta1) + delta1 = int(delta1) if delta2 is None: delta2 = delta1 delta1 = -delta1 else: - delta2 = long(delta2) + delta2 = int(delta2) except ValueError: pass except: pass