gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.archive/attic/gis

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8215 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 3 insertions, 2 deletions

diff --git a/tests/regressiontests/requests/tests.py b/tests/regressiontests/requests/tests.py
index aaaef1d8b0..a091113515 100644
--- a/tests/regressiontests/requests/tests.py
+++ b/tests/regressiontests/requests/tests.py
@@ -20,8 +20,9 @@ META:{...}>
 ...    def __init__(self, *args, **kwargs):
 ...        super(FakeModPythonRequest, self).__init__(*args, **kwargs)
 ...        self._get = self._post = self._meta = self._cookies = {}
->>> class Dummy: pass
-...
+>>> class Dummy:
+...     def get_options(self):
+...         return {}
 >>> req = Dummy()
 >>> req.uri = 'bogus'
 >>> print repr(FakeModPythonRequest(req))