|
@@ -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,
|
|
|
}
|
|
|
],
|