diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-05-18 10:45:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-18 10:45:30 +0100 |
| commit | 4d1afb1dfe678898322479e229b3d51cc33c3fd2 (patch) | |
| tree | 0aa0009fc0f1c8ca09f4379810ac71a34e0ee775 /synapse/push/httppusher.py | |
| parent | fix mypy for tests/replication (#7518) (diff) | |
| parent | changelog (diff) | |
| download | synapse-4d1afb1dfe678898322479e229b3d51cc33c3fd2.tar.xz | |
Merge pull request #7519 from matrix-org/rav/kill_py2_code
Kill off some old python 2 code
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 5bb17d1228..eaaa7afc91 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( @@ -318,7 +313,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, } ], @@ -347,7 +342,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, } @@ -409,7 +404,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, } ], |