diff options
| author | Erik Johnston <erik@matrix.org> | 2020-05-21 15:19:00 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-05-21 15:19:00 +0100 |
| commit | cf92310da26f9b6e03e98055e55c7e9767225742 (patch) | |
| tree | 832140c94907ed381004d01f859abbf2fa86dd3b /synapse/push/httppusher.py | |
| parent | Merge branch 'rav/matrix_hacks' into matrix-org-hotfixes (diff) | |
| parent | Stub out GET presence requests in the frontend proxy (#7545) (diff) | |
| download | synapse-cf92310da26f9b6e03e98055e55c7e9767225742.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/push/httppusher.py')
| -rw-r--r-- | synapse/push/httppusher.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py index 73a63ec78a..3efc825d15 100644 --- a/synapse/push/httppusher.py +++ b/synapse/push/httppusher.py @@ -15,8 +15,6 @@ # limitations under the License. import logging -import six - from prometheus_client import Counter from twisted.internet import defer @@ -28,9 +26,6 @@ from synapse.push import PusherConfigException from . import push_rule_evaluator, push_tools -if six.PY3: - long = int - logger = logging.getLogger(__name__) http_push_processed_counter = Counter( @@ -322,7 +317,7 @@ class HttpPusher(object): { "app_id": self.app_id, "pushkey": self.pushkey, - "pushkey_ts": long(self.pushkey_ts / 1000), + "pushkey_ts": int(self.pushkey_ts / 1000), "data": self.data_minus_url, } ], @@ -351,7 +346,7 @@ class HttpPusher(object): { "app_id": self.app_id, "pushkey": self.pushkey, - "pushkey_ts": long(self.pushkey_ts / 1000), + "pushkey_ts": int(self.pushkey_ts / 1000), "data": self.data_minus_url, "tweaks": tweaks, } @@ -413,7 +408,7 @@ class HttpPusher(object): { "app_id": self.app_id, "pushkey": self.pushkey, - "pushkey_ts": long(self.pushkey_ts / 1000), + "pushkey_ts": int(self.pushkey_ts / 1000), "data": self.data_minus_url, } ], |