Skip to content
Snippets Groups Projects
Commit bcdcfa32 authored by Tanner Prestegard's avatar Tanner Prestegard Committed by GraceDB
Browse files

Python 3: remove unnecessary use of long()

parent 15fb3678
No related branches found
No related tags found
1 merge request!29Python3
......@@ -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)))
......
......@@ -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"
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment