diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-12 15:08:29 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-12 15:08:29 +0000 |
| commit | 1fc2a0e33ef6e88a79dbf4325468d8eb77db0f65 (patch) | |
| tree | a4376730c84ee3950bf4e5eedf8bfa2c1903f6b9 | |
| parent | Consistently url decode and decode as utf 8 the URL parts (diff) | |
| download | synapse-1fc2a0e33ef6e88a79dbf4325468d8eb77db0f65.tar.xz | |
Fix tests and remove debug logging
| -rw-r--r-- | synapse/http/server.py | 4 | ||||
| -rw-r--r-- | tests/utils.py | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py index 2d5d71c8aa..f33859cf76 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py @@ -124,14 +124,10 @@ class JsonResource(HttpServer, resource.Resource): # returned response. We pass both the request and any # matched groups from the regex to the callback. - logger.debug("url things: %r", m.groups()) - args = [ urllib.unquote(u).decode("UTF-8") for u in m.groups() ] - logger.debug("url things args: %r", args) - code, response = yield path_entry.callback( request, *args diff --git a/tests/utils.py b/tests/utils.py index f9a34748cd..70a221550c 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -29,7 +29,7 @@ from twisted.enterprise.adbapi import ConnectionPool from collections import namedtuple from mock import patch, Mock -import json +import urllib import urlparse from inspect import getcallargs @@ -103,9 +103,14 @@ class MockHttpResource(HttpServer): matcher = pattern.match(path) if matcher: try: + args = [ + urllib.unquote(u).decode("UTF-8") + for u in matcher.groups() + ] + (code, response) = yield func( mock_request, - *matcher.groups() + *args ) defer.returnValue((code, response)) except CodeMessageException as e: |