changeset a235715022e5 in /home/hg/repos/python-nbxmpp

details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=a235715022e5 description: Fix tests for py3k

diffstat:

nbxmpp/idlequeue.py | 4 ++-- nbxmpp/transports_nb.py | 2 +- test/lib/mock.py | 2 +- test/runtests.py | 11 ++++++----- test/unit/test_xmpp_transports_nb2.py | 5 +++-- 5 files changed, 13 insertions(+), 11 deletions(-)

diffs (103 lines):

diff -r 1affd30d986f -r a235715022e5 nbxmpp/idlequeue.py --- a/nbxmpp/idlequeue.py Sun Aug 16 21:34:37 2015 +0200 +++ b/nbxmpp/idlequeue.py Tue Sep 01 20:38:24 2015 +0100 @@ -42,7 +42,7 @@ elif os.name == 'posix': import fcntl

-if sys.version_info[0] == 2: +if sys.version_info[0] == 2 or not HAVE_GLIB: FLAG_WRITE = 20 # write only FLAG_READ = 19 # read only FLAG_READ_WRITE = 23 # read and write @@ -568,7 +568,7 @@ def process(self): self._check_time_events()

- if sys.version_info[0] == 2: + if sys.version_info[0] == 2 or not HAVE_GLIB: def current_time(self): return gobject.get_current_time() * 1e6 else: diff -r 1affd30d986f -r a235715022e5 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sun Aug 16 21:34:37 2015 +0200 +++ b/nbxmpp/transports_nb.py Tue Sep 01 20:38:24 2015 +0100 @@ -821,7 +821,7 @@ for dummy in header: row = dummy.split(' ', 1) headers[row[0][:-1]] = row[1] - body_size = headers['Content-Length'] + body_size = int(headers['Content-Length']) rest_splitted = splitted[2:] while (len(httpbody) < body_size) and rest_splitted: # Complete httpbody until it has the announced size diff -r 1affd30d986f -r a235715022e5 test/lib/mock.py --- a/test/lib/mock.py Sun Aug 16 21:34:37 2015 +0200 +++ b/test/lib/mock.py Tue Sep 01 20:38:24 2015 +0100 @@ -212,7 +212,7 @@ elif isinstance(n, str): return self.kwparams[n] else: - raise IndexError, 'illegal index type for getParam' + raise IndexError('illegal index type for getParam')

def getNumParams(self): return len(self.params) diff -r 1affd30d986f -r a235715022e5 test/runtests.py --- a/test/runtests.py Sun Aug 16 21:34:37 2015 +0200 +++ b/test/runtests.py Tue Sep 01 20:38:24 2015 +0100 @@ -6,6 +6,7 @@

Unit tests tests will be run on each commit. ''' +from __future__ import print_function

import sys import unittest @@ -16,19 +17,19 @@ shortargs = 'hv:' longargs = 'help verbose=' opts, args = getopt.getopt(sys.argv[1:], shortargs, longargs.split()) -except getopt.error, msg: - print msg - print 'for help use --help' +except getopt.error as msg: + print(msg) + print('for help use --help') sys.exit(2) for o, a in opts: if o in ('-h', '--help'): - print 'runtests [--help] [--verbose level]' + print('runtests [--help] [--verbose level]') sys.exit() elif o in ('-v', '--verbose'): try: verbose = int(a) except Exception: - print 'verbose must be a number >= 0' + print('verbose must be a number >= 0') sys.exit(2)

# new test modules need to be added manually diff -r 1affd30d986f -r a235715022e5 test/unit/test_xmpp_transports_nb2.py --- a/test/unit/test_xmpp_transports_nb2.py Sun Aug 16 21:34:37 2015 +0200 +++ b/test/unit/test_xmpp_transports_nb2.py Tue Sep 01 20:38:24 2015 +0100 @@ -72,7 +72,7 @@ ips = socket.getaddrinfo('gajim.org', 5222, socket.AF_UNSPEC, socket.SOCK_STREAM) ip = ips[0] - except socket.error, e: + except socket.error as e: self.testcase.fail(msg=str(e))

self.socket = transports_nb.NonBlockingTCP( @@ -175,7 +175,8 @@ sock._do_send() sock._do_send() self.assertTrue(self.client.socket.state == 'CONNECTED') - self.assertTrue(data_part1 in outgoing and data_part2 in outgoing) + self.assertTrue(data_part1.encode('utf8') in outgoing) + self.assertTrue(data_part2.encode('utf8') in outgoing) self.assertFalse(sock.sendqueue and sock.sendbuff, msg='There is still unsend data in buffers')