Skip to content

Commit 7376d32

Browse files
Fix bad expansions (#259)
* fix datadog rum config expansion * trailing space Hey I ran lint this time
1 parent 49e1b09 commit 7376d32

1 file changed

Lines changed: 13 additions & 9 deletions

File tree

profiles/__init__.py

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def user(uid=None, info=None):
9999
# ldap_get_member() returns a BadQueryError if getting the user's information fails.
100100
# Flask already treats a stray BadQueryError as a 404, but actually handling it prevents the traceback
101101
# from getting dumped into the log.
102-
return render_template("404.html", message=bqe, *app.config['DATADOG_RUM_CONFIG']), 404
102+
return render_template("404.html", message=bqe, **app.config['DATADOG_RUM_CONFIG']), 404
103103

104104

105105
@app.route("/results", methods=["POST"])
@@ -121,7 +121,7 @@ def search(searched=None, info=None):
121121
return redirect("/user/" + members[0].uid, 302)
122122
return render_template(
123123
"listing.html", info=info, title="Search Results: " + searched,
124-
members=members, *app.config['DATADOG_RUM_CONFIG']
124+
members=members, **app.config['DATADOG_RUM_CONFIG']
125125
)
126126

127127

@@ -134,25 +134,29 @@ def group(_group=None, info=None):
134134
if _group == "eboard":
135135
return render_template(
136136
"listing.html", info=info, title=group_desc,
137-
members=ldap_get_eboard(), *app.config['DATADOG_RUM_CONFIG']
137+
members=ldap_get_eboard(), **app.config['DATADOG_RUM_CONFIG']
138138
)
139139

140140
return render_template(
141141
"listing.html",
142142
info=info,
143143
title=group_desc,
144144
members=_ldap_get_group_members(_group),
145-
*app.config['DATADOG_RUM_CONFIG']
145+
**app.config['DATADOG_RUM_CONFIG']
146146
)
147147

148148

149149
@app.route("/year/<_year>", methods=["GET"])
150150
@auth.oidc_auth("default")
151151
@before_request
152152
def year(_year=None, info=None):
153+
print(_year)
153154
return render_template(
154-
"listing.html", info=info, title="Year: " + _year,
155-
members=ldap_get_year(_year), *app.config['DATADOG_RUM_CONFIG']
155+
"listing.html",
156+
info=info,
157+
title="Year: " + _year,
158+
members=ldap_get_year(_year),
159+
**app.config['DATADOG_RUM_CONFIG']
156160
)
157161

158162

@@ -189,7 +193,7 @@ def image(uid):
189193
try:
190194
return get_image(uid)
191195
except BadQueryError as bqe:
192-
return render_template("404.html", message=bqe, *app.config['DATADOG_RUM_CONFIG']), 404
196+
return render_template("404.html", message=bqe, **app.config['DATADOG_RUM_CONFIG']), 404
193197

194198

195199
@app.route("/clearcache")
@@ -222,9 +226,9 @@ def clear_cache(info=None):
222226
@app.errorhandler(500)
223227
def handle_internal_error(e):
224228
if isinstance(e, NotFound):
225-
return render_template("404.html", message=str(e), *app.config['DATADOG_RUM_CONFIG']), 404
229+
return render_template("404.html", message=str(e), **app.config['DATADOG_RUM_CONFIG']), 404
226230
if isinstance(e.original_exception, BadQueryError):
227-
return render_template("404.html", message=e.original_exception, *app.config['DATADOG_RUM_CONFIG']), 404
231+
return render_template("404.html", message=e.original_exception, **app.config['DATADOG_RUM_CONFIG']), 404
228232
raise e.original_exception
229233

230234

0 commit comments

Comments
 (0)