changeset 168bcc096a95 in /home/hg/repos/python-nbxmpp
details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=168bcc096a95 description: py2 -> py3
diffstat:
nbxmpp/auth_nb.py | 2 +- nbxmpp/bosh.py | 2 +- nbxmpp/rndg.py | 2 +- nbxmpp/tls_nb.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
diffs (46 lines):
diff -r 72257f8a4fc6 -r 168bcc096a95 nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Mon Dec 23 16:52:52 2013 +0100 +++ b/nbxmpp/auth_nb.py Mon Dec 30 21:18:37 2013 +0100 @@ -33,7 +33,7 @@ import logging log = logging.getLogger('nbxmpp.auth_nb')
-import rndg +from . import rndg
def HH(some): return hashlib.md5(some).hexdigest() def H(some): return hashlib.md5(some).digest() diff -r 72257f8a4fc6 -r 168bcc096a95 nbxmpp/bosh.py --- a/nbxmpp/bosh.py Mon Dec 23 16:52:52 2013 +0100 +++ b/nbxmpp/bosh.py Mon Dec 30 21:18:37 2013 +0100 @@ -29,7 +29,7 @@ import logging log = logging.getLogger('nbxmpp.bosh')
-import rndg +from . import rndg
KEY_COUNT = 10
diff -r 72257f8a4fc6 -r 168bcc096a95 nbxmpp/rndg.py --- a/nbxmpp/rndg.py Mon Dec 23 16:52:52 2013 +0100 +++ b/nbxmpp/rndg.py Mon Dec 30 21:18:37 2013 +0100 @@ -45,5 +45,5 @@ # Extract random bytes from OpenSSL PRNG random_str = OpenSSL.rand.bytes(bytes)
- x = long(binascii.hexlify(random_str), 16) + x = int(binascii.hexlify(random_str), 16) return x >> (bytes * 8 - k) # trim excess bits diff -r 72257f8a4fc6 -r 168bcc096a95 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Mon Dec 23 16:52:52 2013 +0100 +++ b/nbxmpp/tls_nb.py Mon Dec 30 21:18:37 2013 +0100 @@ -363,7 +363,7 @@ OpenSSL.SSL.OP_SINGLE_DH_USE try: flags |= OpenSSL.SSL.OP_NO_TICKET - except AttributeError, e: + except AttributeError as e: # py-OpenSSL < 0.9 or old OpenSSL flags |= 16384 tcpsock._sslContext.set_options(flags)