@@ -352,59 +352,23 @@ def test_surprising_characters(self):
352352
353353
354354def get_context_processors ():
355- """Get context processors in a way that works for Django 1.4, 1.7, and 1.8"""
355+ """Get context processors in a way that works for Django 1.7 and 1.8+ """
356356 try :
357+ # 1.7
357358 from django .template .context import get_standard_processors
358359 return get_standard_processors ()
359360 except ImportError :
361+ # 1.8+
360362 try :
361363 from django .template .engine import Engine
362364 engine = Engine .get_default ()
363365 except ImproperlyConfigured :
364366 return []
365367 return engine .template_context_processors
366368
367- try :
368- # for Django 1.4 support
369- from django .db import close_connection
370-
371- class ClientHandler (django .test .client .ClientHandler ):
372- """
373- Handler that stores the real request object on the response.
374-
375- Almost all the code comes from the parent class.
376- """
377-
378- def __call__ (self , environ ):
379- # Set up middleware if needed. We couldn't do this earlier, because
380- # settings weren't available.
381- if self .wsgi_request_middleware is None :
382- self .load_middleware ()
383-
384- signals .request_started .send (sender = self .__class__ )
385- try :
386- request = WSGIRequest (environ )
387- # sneaky little hack so that we can easily get round
388- # CsrfViewMiddleware. This makes life easier, and is probably
389- # required for backwards compatibility with external tests against
390- # admin views.
391- request ._dont_enforce_csrf_checks = not self .enforce_csrf_checks
392- response = self .get_response (request )
393- finally :
394- signals .request_finished .disconnect (close_connection )
395- signals .request_finished .send (sender = self .__class__ )
396- signals .request_finished .connect (close_connection )
397-
398- # Store the request object.
399- response .wsgi_request = request
400- return response
401-
402- @property
403- def wsgi_request_middleware (self ):
404- return self ._request_middleware
405- except ImportError :
406- # for 1.7 support
407- class ClientHandler (django .test .client .ClientHandler ):
408- @property
409- def wsgi_request_middleware (self ):
410- return self ._request_middleware
369+
370+ # for 1.7 support
371+ class ClientHandler (django .test .client .ClientHandler ):
372+ @property
373+ def wsgi_request_middleware (self ):
374+ return self ._request_middleware
0 commit comments