From bcdcfa323f84d6709fd9a245db61fde27e8ec9cd Mon Sep 17 00:00:00 2001
From: Tanner Prestegard <tanner.prestegard@ligo.org>
Date: Fri, 19 Jul 2019 08:02:54 -0500
Subject: [PATCH] Python 3: remove unnecessary use of long()
---
gracedb/core/utils.py | 2 +-
gracedb/events/templatetags/timeutil.py | 8 ++++----
gracedb/events/views.py | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gracedb/core/utils.py b/gracedb/core/utils.py
index 40fe4e781..0c629ea0e 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 dc72a5c95..95fdf8b62 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 7a981ddef..c79206a1b 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
--
GitLab