diff options
author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-06 09:55:21 -0500 |
---|---|---|
committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-06 09:55:21 -0500 |
commit | ca6496c27c7219827826a58adf3d13c13c6cd53f (patch) | |
tree | 89b32bcf6e8e7b0357c209f2906f42e71d1e5277 | |
parent | Merge branch 'develop' into daniel/3pidinvites (diff) | |
parent | Use space not dash as delimiter (diff) | |
download | synapse-ca6496c27c7219827826a58adf3d13c13c6cd53f.tar.xz |
Merge branch 'daniel/useragent' into daniel/3pidinvites
Diffstat (limited to '')
-rw-r--r-- | synapse/http/client.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index 5017801773..79c529291f 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -69,7 +69,7 @@ class SimpleHttpClient(object): ) self.user_agent = hs.version_string if hs.config.user_agent_suffix: - self.user_agent += " - " + hs.config.user_agent_suffix + self.user_agent = "%s %s" % (self.user_agent, hs.config.user_agent_suffix,) def request(self, method, uri, *args, **kwargs): # A small wrapper around self.agent.request() so we can easily attach |