copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace long() in remaining python2 code with int().

This commit is contained in:
Emmanuel Gil Peyrot 2017-02-07 21:14:25 +00:00
parent 381a8f2be8
commit 1f9ac730ce
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/protocol/bytestream.py
View File

@ -435,8 +435,8 @@ class ConnectionSocks5Bytestream(ConnectionBytestream):
# it's an IPv6 # it's an IPv6
return True return True
ip_s = ip.split('.') ip_s = ip.split('.')
ip_l = long(ip_s[0])<<24 | long(ip_s[1])<<16 | long(ip_s[2])<<8 | \ ip_l = int(ip_s[0])<<24 | int(ip_s[1])<<16 | int(ip_s[2])<<8 | \
long(ip_s[3]) int(ip_s[3])
# 10/8 # 10/8
if ip_l & (255<<24) == 10<<24: if ip_l & (255<<24) == 10<<24:
return True return True

2
src/common/stanza_session.py
View File

@ -553,7 +553,7 @@ class EncryptedStanzaSession(ArchivingStanzaSession):
n, e = (crypto.decode_mpi(base64.b64decode( n, e = (crypto.decode_mpi(base64.b64decode(
keyvalue.getTagData(x))) for x in ('Modulus', 'Exponent')) keyvalue.getTagData(x))) for x in ('Modulus', 'Exponent'))
eir_pubkey = RSA.construct((n, long(e))) eir_pubkey = RSA.construct((n, int(e)))
pubkey_o = nbxmpp.c14n.c14n(keyvalue, self._is_buggy_gajim()) pubkey_o = nbxmpp.c14n.c14n(keyvalue, self._is_buggy_gajim())
else: else:

4
src/remote_control.py
View File

@ -698,7 +698,7 @@ class SignalObject(dbus.service.Object):
if self._is_first(): if self._is_first():
win.window.focus(Gtk.get_current_event_time()) win.window.focus(Gtk.get_current_event_time())
else: else:
win.window.focus(long(time())) win.window.focus(int(time()))
@dbus.service.method(INTERFACE, in_signature='', out_signature='') @dbus.service.method(INTERFACE, in_signature='', out_signature='')
def show_roster(self): def show_roster(self):
@ -711,7 +711,7 @@ class SignalObject(dbus.service.Object):
if self._is_first(): if self._is_first():
win.window.focus(Gtk.get_current_event_time()) win.window.focus(Gtk.get_current_event_time())
else: else:
win.window.focus(long(time())) win.window.focus(int(time()))
@dbus.service.method(INTERFACE, in_signature='', out_signature='') @dbus.service.method(INTERFACE, in_signature='', out_signature='')
def toggle_ipython(self): def toggle_ipython(self):