Tweak server handler injection.

[jelmer/dulwich-libgit2.git] / dulwich / web.py

diff --git a/dulwich/web.py b/dulwich/web.py
index 73aed6f6b212e004a7d6b6917014ad7fc4b8b9ac..d7f845ad1ada668ab0dc0adbf9f8e8f550e56fde 100644 (file)
--- a/dulwich/web.py
+++ b/dulwich/web.py
@@ -259,7 +259,7 @@ class HTTPGitRequest(object):
     def __init__(self, environ, start_response, dumb=False, handlers=None):
         self.environ = environ
         self.dumb = dumb
-        self.handlers = handlers and handlers or DEFAULT_HANDLERS
+        self.handlers = handlers
         self._start_response = start_response
         self._cache_headers = []
         self._headers = []
@@ -340,7 +340,9 @@ class HTTPGitApplication(object):
     def __init__(self, backend, dumb=False, handlers=None):
         self.backend = backend
         self.dumb = dumb
-        self.handlers = handlers
+        self.handlers = dict(DEFAULT_HANDLERS)
+        if handlers is not None:
+            self.handlers.update(handlers)
 
     def __call__(self, environ, start_response):
         path = environ['PATH_INFO']