summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-10-06 09:55:21 -0500
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-10-06 09:55:21 -0500
commitca6496c27c7219827826a58adf3d13c13c6cd53f (patch)
tree89b32bcf6e8e7b0357c209f2906f42e71d1e5277
parentMerge branch 'develop' into daniel/3pidinvites (diff)
parentUse space not dash as delimiter (diff)
downloadsynapse-ca6496c27c7219827826a58adf3d13c13c6cd53f.tar.xz
Merge branch 'daniel/useragent' into daniel/3pidinvites
-rw-r--r--synapse/http/client.py2
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