From 62564797f5f9c6b1295a98a9742ae226b87a135e Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 9 Aug 2018 09:56:10 +0100
Subject: [PATCH] Fixup wording and remove dead code

---
 changelog.d/3632.misc             | 1 +
 synapse/replication/http/_base.py | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog.d/3632.misc b/changelog.d/3632.misc
index e69de29bb2..9d64bbe83b 100644
--- a/changelog.d/3632.misc
+++ b/changelog.d/3632.misc
@@ -0,0 +1 @@
+Refactor HTTP replication endpoints to reduce code duplication
diff --git a/synapse/replication/http/_base.py b/synapse/replication/http/_base.py
index 53a0fd459a..5e5376cf58 100644
--- a/synapse/replication/http/_base.py
+++ b/synapse/replication/http/_base.py
@@ -183,7 +183,6 @@ class ReplicationEndpoint(object):
         """
 
         url_args = list(self.PATH_ARGS)
-        method = "GET"
         handler = self._handle_request
         method = self.METHOD
 
@@ -201,7 +200,7 @@ class ReplicationEndpoint(object):
 
     def _cached_handler(self, request, txn_id, **kwargs):
         """Called on new incoming requests when caching is enabled. Checks
-        if their is a cached response for the request and returns that,
+        if there is a cached response for the request and returns that,
         otherwise calls `_handle_request` and caches its response.
         """
         # We just use the txn_id here, but we probably also want to use the