Merge branch 'daniel/useragent' into daniel/3pidinvites

This commit is contained in:
Daniel Wagner-Hall 2015-10-06 09:55:21 -05:00
commit ca6496c27c

View File

@ -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