Skip to content

Commit e28307a

Browse files
14droplets14droplets
authored
Fix static urls with yarl 1.9+ (#479)
1 parent f320aff commit e28307a

File tree

8 files changed

+32
-32
lines changed

8 files changed

+32
-32
lines changed

‎aiohttp_debugtoolbar/panels/middlewares.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ def populate(self, request):
3434
self.data = {"middlewares": middleware_names}
3535

3636
def render_vars(self, request):
37-
static_path = self._request.app.router[STATIC_ROUTE_NAME].url_for(filename="")
37+
static_path = self._request.app.router[STATIC_ROUTE_NAME].canonical
3838
return {"static_path": static_path}

‎aiohttp_debugtoolbar/panels/templates/traceback.jinja2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,5 @@
7979
DEBUG_TOOLBAR_STATIC_PATH = "{{ static_path }}",
8080
DEBUG_TOOLBAR_ROOT_PATH = "{{ root_path }}";
8181
</script>
82-
<script data-main="{{ static_path }}js/debugger"
83-
src="{{ static_path }}js/require.js"></script>
82+
<script data-main="{{ static_path }}/js/debugger"
83+
src="{{ static_path }}/js/require.js"></script>

‎aiohttp_debugtoolbar/panels/traceback.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ def render_content(self, request):
5555
return super().render_content(request)
5656

5757
def render_vars(self, request):
58-
static_path = self._request.app.router[STATIC_ROUTE_NAME].url_for(filename="")
58+
static_path = self._request.app.router[STATIC_ROUTE_NAME].canonical
5959
root_path = self.request.app.router[ROOT_ROUTE_NAME].url_for()
6060
return {"static_path": static_path, "root_path": root_path}

‎aiohttp_debugtoolbar/tbtools/tbtools.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ def render_summary(self, app, include_title=True):
207207

208208
def render_full(self, request, lodgeit_url=None):
209209
"""Render the Full HTML page with the traceback info."""
210-
static_path = request.app.router[STATIC_ROUTE_NAME].url_for(filename="")
210+
static_path = request.app.router[STATIC_ROUTE_NAME].canonical
211211
root_path = request.app.router[ROOT_ROUTE_NAME].url_for()
212212
exc = escape(self.exception)
213213
summary = self.render_summary(request.app, include_title=False)

‎aiohttp_debugtoolbar/templates/console.jinja2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<html>
44
<head>
55
<title>{{ title }} // Werkzeug Debugger</title>
6-
<link rel="stylesheet" href="{{ static_path }}css/debugger.css" type="text/css" />
6+
<link rel="stylesheet" href="{{ static_path }}/css/debugger.css" type="text/css" />
77
<script type="text/javascript">
88
var TRACEBACK = {{ str(traceback_id) }},
99
CONSOLE_MODE = {{ console }},
1010
DEBUGGER_TOKEN = "{{ token }}",
1111
EVALEX = {{ evalex }};
1212
</script>
13-
<script data-main="{{ static_path }}js/debugger" src="{{ static_path }}js/require.js"></script>
13+
<script data-main="{{ static_path }}/js/debugger" src="{{ static_path }}/js/require.js"></script>
1414
</head>
1515
<body>
1616

‎aiohttp_debugtoolbar/templates/exception.jinja2

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<head>
66
<title>{{ title }} // Werkzeug Debugger</title>
77
<!--bootstrap version 2.3.2-->
8-
<link rel="stylesheet" type="text/css" href="{{ static_path }}css/bootstrap.min.css">
9-
<link rel="stylesheet" type="text/css" href="{{ static_path }}css/toolbar.css">
10-
<link rel="stylesheet" href="{{ static_path }}css/debugger.css"
8+
<link rel="stylesheet" type="text/css" href="{{ static_path }}/css/bootstrap.min.css">
9+
<link rel="stylesheet" type="text/css" href="{{ static_path }}/css/toolbar.css">
10+
<link rel="stylesheet" href="{{ static_path }}/css/debugger.css"
1111
type="text/css">
12-
{# <link rel="stylesheet" type="text/css" href="{{ static_path }}css/highlightjs_default.min.css">#}
13-
<link rel="stylesheet" type="text/css" href="{{ static_path }}css/prism.css">
12+
{# <link rel="stylesheet" type="text/css" href="{{ static_path }}/css/highlightjs_default.min.css">#}
13+
<link rel="stylesheet" type="text/css" href="{{ static_path }}/css/prism.css">
1414
<script type="text/javascript">
1515
var TRACEBACK = {{ traceback_id }},
1616
DEBUGGER_TOKEN = "{{ token }}",
@@ -19,8 +19,8 @@
1919
DEBUG_TOOLBAR_STATIC_PATH = "{{ static_path }}",
2020
DEBUG_TOOLBAR_ROOT_PATH = "{{ root_path }}";
2121
</script>
22-
<script data-main="{{ static_path }}js/debugger"
23-
src="{{ static_path }}js/require.js"></script>
22+
<script data-main="{{ static_path }}/js/debugger"
23+
src="{{ static_path }}/js/require.js"></script>
2424
</head>
2525
<body>
2626
<div class="debugger">
@@ -100,8 +100,8 @@
100100
101101
-->
102102

103-
{# <script type="text/javascript" src="{{ static_path }}js/highlight.min.js"></script>#}
104-
<script type="text/javascript" src="{{ static_path }}js/prism.js"></script>
103+
{# <script type="text/javascript" src="{{ static_path }}/js/highlight.min.js"></script>#}
104+
<script type="text/javascript" src="{{ static_path }}/js/prism.js"></script>
105105
</body>
106106

107107
</html>

‎aiohttp_debugtoolbar/templates/toolbar.jinja2

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<meta charset="UTF-8" />
55
<title>Aiohttp Debug Toolbar</title>
66

7-
<link rel="stylesheet" type="text/css" href="{{ static_path }}css/bootstrap.min.css">
8-
<link rel="stylesheet" type="text/css" href="{{ static_path }}css/toolbar.css">
9-
<link rel="stylesheet" type="text/css" href="{{ static_path }}css/dashboard.css">
10-
<link rel="stylesheet" href="{{ static_path }}css/debugger.css" type="text/css">
11-
{# <link rel="stylesheet" type="text/css" href="{{ static_path }}css/highlightjs_default.min.css">#}
12-
<link rel="stylesheet" type="text/css" href="{{ static_path }}css/prism.css">
7+
<link rel="stylesheet" type="text/css" href="{{ static_path }}/css/bootstrap.min.css">
8+
<link rel="stylesheet" type="text/css" href="{{ static_path }}/css/toolbar.css">
9+
<link rel="stylesheet" type="text/css" href="{{ static_path }}/css/dashboard.css">
10+
<link rel="stylesheet" href="{{ static_path }}/css/debugger.css" type="text/css">
11+
{# <link rel="stylesheet" type="text/css" href="{{ static_path }}/css/highlightjs_default.min.css">#}
12+
<link rel="stylesheet" type="text/css" href="{{ static_path }}/css/prism.css">
1313

1414

1515
{# include scripts here that should be included before pageload #}
@@ -19,7 +19,7 @@
1919
<script type="text/javascript">
2020
var DEBUG_TOOLBAR_STATIC_PATH = '{{ static_path }}';
2121
</script>
22-
<script src="{{ static_path }}js/jquery-1.10.2.min.js"></script>
22+
<script src="{{ static_path }}/js/jquery-1.10.2.min.js"></script>
2323
</head>
2424
<body>
2525

@@ -33,7 +33,7 @@
3333
<span class="icon-bar"></span>
3434
</button>
3535
<a class="navbar-brand" href="{{ root_path }}">
36-
<img src="{{ static_path }}img/aiohttp.svg"/>
36+
<img src="{{ static_path }}/img/aiohttp.svg"/>
3737
Aiohttp DebugToolbar</a>
3838
</div>
3939
<div class="navbar-collapse collapse">
@@ -67,10 +67,10 @@
6767
</div>
6868

6969
{# scripts that can be included after pageload #}
70-
<script src="{{ static_path }}js/jquery.cookie.js"></script>
71-
<script src="{{ static_path }}js/jquery.tablesorter.min.js"></script>
72-
<script src="{{ static_path }}js/bootstrap.min.js"></script>
73-
<script src="{{ static_path }}js/toolbar.js"></script>
70+
<script src="{{ static_path }}/js/jquery.cookie.js"></script>
71+
<script src="{{ static_path }}/js/jquery.tablesorter.min.js"></script>
72+
<script src="{{ static_path }}/js/bootstrap.min.js"></script>
73+
<script src="{{ static_path }}/js/toolbar.js"></script>
7474
<script>
7575
$(function () {
7676
$('#myTab a:first').tab('show');
@@ -128,9 +128,9 @@
128128
129129
});
130130
</script>
131-
{# <script type="text/javascript" src="{{ static_path }}js/highlight.min.js"></script>#}
131+
{# <script type="text/javascript" src="{{ static_path }}/js/highlight.min.js"></script>#}
132132
{# <script>hljs.initHighlightingOnLoad();</script>#}
133-
<script type="text/javascript" src="{{ static_path }}js/prism.js"></script>
133+
<script type="text/javascript" src="{{ static_path }}/js/prism.js"></script>
134134

135135
</body>
136136
</html>

‎aiohttp_debugtoolbar/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ async def request_view(request):
2626
panels = toolbar.panels if toolbar else []
2727
global_panels = toolbar.global_panels if toolbar else []
2828

29-
static_path = request.app.router[STATIC_ROUTE_NAME].url_for(filename="")
29+
static_path = request.app.router[STATIC_ROUTE_NAME].canonical
3030
root_path = request.app.router[ROOT_ROUTE_NAME].url_for()
3131

3232
button_style = settings.get("button_style", "")
@@ -132,7 +132,7 @@ async def execute(self, request):
132132
# @aiohttp_jinja2.template('console.jinja2', app_key=TEMPLATE_KEY)
133133
# async def console(self, request):
134134
# self._validate_token(request)
135-
# static_path = request.app.router[STATIC_ROUTE_NAME].url(filename='')
135+
# static_path = request.app.router[STATIC_ROUTE_NAME].canonical
136136
# root_path = request.app.router[ROOT_ROUTE_NAME].url()
137137
# token = request.query.get('token')
138138
# tb = await self._get_tb(request)

0 commit comments

Comments
 (0)