Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions guillotina/tests/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ def make_mocked_request(

if protocol is sentinel:
protocol = mock.Mock()
type(protocol).ssl_context = mock.PropertyMock(return_value=sslcontext)

if transport is sentinel:
transport = test_utils._create_transport(sslcontext)
Expand Down
9 changes: 9 additions & 0 deletions guillotina/traversal.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,10 @@ def add_app(self, app):
def current_app(self):
return self._current_app

@current_app.setter
def current_app(self, app):
self._current_app = app

@contextmanager
def set_current_app(self, app):
assert app in self._apps, "Expected one of the following apps {!r}, got {!r}".format(self._apps, app)
Expand All @@ -174,6 +178,11 @@ def set_current_app(self, app):
def apps(self):
return tuple(self._apps)

@property
def route(self):
# aiohttp 3.11+ accesses match_info.route for middleware caching
return None

def freeze(self):
self._frozen = True

Expand Down
9 changes: 4 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
Cython==0.29.34
aiohttp==3.8.4
aiohttp==3.13.3
asyncpg==0.29.0
cffi==1.15.1
chardet==3.0.4
jsonschema==2.6.0
multidict==4.5.2
multidict==6.1.0
pycparser==2.18
pycryptodome==3.6.6
PyJWT==2.9.0
python-dateutil==2.8.2
PyYaml==5.1
six==1.11.0
ujson==1.35
yarl==1.2.6
yarl==1.22.0
zope.interface==5.1.0
argon2-cffi==19.2.0
backoff==1.10.0
prometheus-client==0.8.0
brotli==1.1.0
openapi-spec-validator==0.2.8
openapi-spec-validator==0.2.8
Loading