Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
swh-core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Antoine Lambert
swh-core
Commits
02faef83
Commit
02faef83
authored
5 years ago
by
vlorentz
Browse files
Options
Downloads
Patches
Plain Diff
Remove fallback when aiohttp_utils is not installed.
`from aiohttp import Response` raises an `ImportError`.
parent
9c720a14
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
swh/core/api/asynchronous.py
+12
-20
12 additions, 20 deletions
swh/core/api/asynchronous.py
with
12 additions
and
20 deletions
swh/core/api/asynchronous.py
+
12
−
20
View file @
02faef83
...
...
@@ -12,11 +12,7 @@ from deprecated import deprecated
from
.serializers
import
msgpack_dumps
,
msgpack_loads
from
.serializers
import
SWHJSONDecoder
,
SWHJSONEncoder
try
:
from
aiohttp_utils
import
negotiation
,
Response
except
ImportError
:
from
aiohttp
import
Response
negotiation
=
None
from
aiohttp_utils
import
negotiation
,
Response
def
encode_msgpack
(
data
,
**
kwargs
):
...
...
@@ -28,10 +24,7 @@ def encode_msgpack(data, **kwargs):
)
if
negotiation
is
None
:
encode_data_server
=
encode_msgpack
else
:
encode_data_server
=
Response
encode_data_server
=
Response
def
render_msgpack
(
request
,
data
):
...
...
@@ -75,17 +68,16 @@ async def error_middleware(app, handler):
class
RPCServerApp
(
aiohttp
.
web
.
Application
):
def
__init__
(
self
,
*
args
,
middlewares
=
(),
**
kwargs
):
middlewares
=
(
error_middleware
,)
+
middlewares
if
negotiation
:
# renderers are sorted in order of increasing desirability (!)
# see mimeparse.best_match() docstring.
renderers
=
OrderedDict
([
(
'
application/json
'
,
render_json
),
(
'
application/x-msgpack
'
,
render_msgpack
),
])
nego_middleware
=
negotiation
.
negotiation_middleware
(
renderers
=
renderers
,
force_rendering
=
True
)
middlewares
=
(
nego_middleware
,)
+
middlewares
# renderers are sorted in order of increasing desirability (!)
# see mimeparse.best_match() docstring.
renderers
=
OrderedDict
([
(
'
application/json
'
,
render_json
),
(
'
application/x-msgpack
'
,
render_msgpack
),
])
nego_middleware
=
negotiation
.
negotiation_middleware
(
renderers
=
renderers
,
force_rendering
=
True
)
middlewares
=
(
nego_middleware
,)
+
middlewares
super
().
__init__
(
*
args
,
middlewares
=
middlewares
,
**
kwargs
)
...
...
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