summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBarry Warsaw2014-11-11 17:52:12 -0500
committerBarry Warsaw2014-11-11 17:52:12 -0500
commit264ad2c9feda1d000fe90631c3518e4b3ab73680 (patch)
tree02ba40f9f79d5c881d9eaf293bcc25c65508b29b
parentb4936ba0acca23dc61045a9ba604af3a5e29e601 (diff)
downloadmailman-264ad2c9feda1d000fe90631c3518e4b3ab73680.tar.gz
mailman-264ad2c9feda1d000fe90631c3518e4b3ab73680.tar.zst
mailman-264ad2c9feda1d000fe90631c3518e4b3ab73680.zip
Make it work with some pending refactoring in upstream falcon.
-rw-r--r--src/mailman/rest/wsgiapp.py3
-rw-r--r--tox.ini2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/mailman/rest/wsgiapp.py b/src/mailman/rest/wsgiapp.py
index 82f2a3a8f..698c4269d 100644
--- a/src/mailman/rest/wsgiapp.py
+++ b/src/mailman/rest/wsgiapp.py
@@ -31,6 +31,7 @@ import logging
from falcon import API
from falcon.responders import path_not_found
+from falcon.routing import create_http_method_map
from mailman.config import config
from mailman.database.transaction import transactional
from mailman.rest.root import Root
@@ -131,7 +132,7 @@ class RootedAPI(API):
if len(path_segments) == 0:
# We're at the end of the path, so the root must be the
# responder.
- method_map = self._create_http_method_map(
+ method_map = create_http_method_map(
resource, None, None, None)
responder = method_map[method]
return responder, {}, resource
diff --git a/tox.ini b/tox.ini
index 96e75b52b..cb709d81a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@ commands = python -m nose2 -v
#sitepackages = True
usedevelop = True
deps =
- git+https://github.com/racker/falcon.git#egg=falcon
+ git+https://github.com/kgriffs/falcon.git@routing#egg=falcon
# This environment requires you to set up PostgreSQL and create a .cfg file
# somewhere outside of the source tree.