summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Merickel <github@m.merickel.org>2018-10-17 21:10:02 -0500
committerGitHub <noreply@github.com>2018-10-17 21:10:02 -0500
commit41f103af2745c336a3bcdc715e70ef3cb5d1e545 (patch)
tree7bdd86bbe7b2526805b1aa11a485f00159be8cb9 /src
parent66a767f0e1911543b77a4dd768821ee2ed40390a (diff)
parentd3fe14781747539c470089208fa7aeb1b2cbbd6f (diff)
downloadpyramid-41f103af2745c336a3bcdc715e70ef3cb5d1e545.tar.gz
pyramid-41f103af2745c336a3bcdc715e70ef3cb5d1e545.tar.bz2
pyramid-41f103af2745c336a3bcdc715e70ef3cb5d1e545.zip
Merge pull request #3396 from mmerickel/fix-dummy-request-accept
fix the dummy request to support the new accept apis
Diffstat (limited to 'src')
-rw-r--r--src/pyramid/testing.py18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/pyramid/testing.py b/src/pyramid/testing.py
index e2549f0b9..ea86f5852 100644
--- a/src/pyramid/testing.py
+++ b/src/pyramid/testing.py
@@ -2,6 +2,8 @@ import copy
import os
from contextlib import contextmanager
+from webob.acceptparse import create_accept_header
+
from zope.interface import implementer, alsoProvides
from pyramid.interfaces import IRequest, ISession
@@ -340,6 +342,7 @@ class DummyRequest(
charset = 'UTF-8'
script_name = ''
_registry = None
+ _accept = None
request_iface = IRequest
def __init__(
@@ -350,6 +353,7 @@ class DummyRequest(
path='/',
cookies=None,
post=None,
+ accept=None,
**kw
):
if environ is None:
@@ -388,6 +392,7 @@ class DummyRequest(
self.virtual_root = None
self.marshalled = params # repoze.monty
self.session = DummySession()
+ self.accept = accept
self.__dict__.update(kw)
def _get_registry(self):
@@ -403,6 +408,19 @@ class DummyRequest(
registry = property(_get_registry, _set_registry, _del_registry)
+ def _set_accept(self, value):
+ self._accept = create_accept_header(value)
+
+ def _get_accept(self):
+ if self._accept is None:
+ self._accept = create_accept_header(None)
+ return self._accept
+
+ def _del_accept(self):
+ self._accept = None
+
+ accept = property(_get_accept, _set_accept, _del_accept)
+
@reify
def response(self):
f = _get_response_factory(self.registry)