diff -r 4cd9d0a9f42f -r df1e3b67882a VirtualMailManager/transport.py --- a/VirtualMailManager/transport.py Sun Nov 11 16:53:52 2012 +0000 +++ b/VirtualMailManager/transport.py Tue Nov 20 13:40:32 2012 +0000 @@ -32,10 +32,10 @@ self._tid = 0 assert any((tid, transport)) if tid: - assert not isinstance(tid, bool) and isinstance(tid, (int, long)) + assert not isinstance(tid, bool) and isinstance(tid, int) self._load_by_id(tid) else: - assert isinstance(transport, basestring) + assert isinstance(transport, str) self._transport = transport self._load_by_name()