Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
GraceDB Server
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IGWN Computing and Software
GraceDB
GraceDB Server
Commits
bcdcfa32
Commit
bcdcfa32
authored
5 years ago
by
Tanner Prestegard
Committed by
GraceDB
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Python 3: remove unnecessary use of long()
parent
15fb3678
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!29
Python3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
gracedb/core/utils.py
+1
-1
1 addition, 1 deletion
gracedb/core/utils.py
gracedb/events/templatetags/timeutil.py
+4
-4
4 additions, 4 deletions
gracedb/events/templatetags/timeutil.py
gracedb/events/views.py
+2
-2
2 additions, 2 deletions
gracedb/events/views.py
with
7 additions
and
7 deletions
gracedb/core/utils.py
+
1
−
1
View file @
bcdcfa32
...
...
@@ -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
)))
...
...
This diff is collapsed.
Click to expand it.
gracedb/events/templatetags/timeutil.py
+
4
−
4
View file @
bcdcfa32
...
...
@@ -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"
...
...
This diff is collapsed.
Click to expand it.
gracedb/events/views.py
+
2
−
2
View file @
bcdcfa32
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment