Skip to content

Commit

Permalink
Use status_code_str and freshness_lifetime_shared
Browse files Browse the repository at this point in the history
  • Loading branch information
mnot committed Dec 4, 2023
1 parent a523e88 commit 75d5b41
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ classifiers = [
"License :: OSI Approved :: MIT License"
]
dependencies = [
"httplint >= 2023.12.1",
"httplint >= 2023.12.2",
"importlib_resources",
"Jinja2 >= 3.1.2",
"markdown >= 3.4.4",
Expand Down
4 changes: 3 additions & 1 deletion redbot/formatter/slack.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@ def markdown_block(content: str) -> Dict:

def format_headers(self, response: HttpResponseLinter) -> List:
status_line = (
f"HTTP/{response.version} {response.status_code} {response.status_phrase}\n"
f"HTTP/{response.version} "
f"{response.status_code_str} "
f"{response.status_phrase}\n"
)
headers = NL.join(
[f"{name}:{value}" for (name, value) in response.headers.text]
Expand Down
2 changes: 1 addition & 1 deletion redbot/formatter/templates/response_finish.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% macro format_response(r) %}
<span class='status'>HTTP/{{ r.version }} {{ r.status_code }} {{ r.status_phrase }}</span>
<span class='status'>HTTP/{{ r.version }} {{ r.status_code_str }} {{ r.status_phrase }}</span>
{% for hdr in r.headers.text %}
<span data-offset='{{ loop.index0 }}' data-name='{{ hdr[0]|lower }}' class='hdr'>{{ hdr[0] }}:{{ hdr|header_present -}}
{{- hdr[0]|header_description }}</span>
Expand Down
4 changes: 2 additions & 2 deletions redbot/formatter/templates/response_multi_finish.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@
{% elif resource.response.status_code in ["400", "404", "410"] %}
<td class="bad">{{ resource.response.status_code }}</td>
{% else %}
<td>{{ resource.response.status_code }}</td>
<td>{{ resource.response.status_code_str }}</td>
{% endif %}
<td>{{ resource.response.content_length|f_num(by1024=True) }}</td>
<td>{{ yes_no(resource.response.caching.store_shared) }}</td>
<td>{{ yes_no(resource.response.caching.store_private) }}</td>
<td>{{ resource.response.caching.age|relative_time(0,0) or '-' }}</td>
<td>{{ resource.response.caching.freshness_lifetime|relative_time(0,0) or '-' }}</td>
<td>{{ resource.response.caching.freshness_lifetime_shared|relative_time(0,0) or '-' }}</td>
<td>{{ yes_no(resource.ims_support) }}</td>
<td>{{ yes_no(resource.inm_support) }}</td>
{% if resource.gzip_support %}
Expand Down
2 changes: 1 addition & 1 deletion redbot/formatter/text.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def error_output(self, message: str) -> None:
@staticmethod
def format_headers(response: HttpResponseLinter) -> str:
out = [
f"HTTP/{response.version} {response.status_code} {response.status_phrase}"
f"HTTP/{response.version} {response.status_code_str} {response.status_phrase}"
]
return NL.join(out + [f"{h[0]}:{h[1]}" for h in response.headers.text])

Expand Down

0 comments on commit 75d5b41

Please sign in to comment.