From 411c7ede1934fd634cd10ded27be00e7cfbebf50 Mon Sep 17 00:00:00 2001 From: HawkOwl Date: Mon, 21 Sep 2015 16:36:54 +0800 Subject: [PATCH] some cleaning --- autobahn/wamp/exception.py | 2 +- tox.ini | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/autobahn/wamp/exception.py b/autobahn/wamp/exception.py index 02c161ae..89b9aabd 100644 --- a/autobahn/wamp/exception.py +++ b/autobahn/wamp/exception.py @@ -207,7 +207,7 @@ class ApplicationError(Error): self.kwargs = kwargs self.error = error - def __str__(self): + def __unicode__(self): if self.kwargs and 'traceback' in self.kwargs: tb = ':\n' + '\n'.join(self.kwargs.pop('traceback')) + '\n' self.kwargs['traceback'] = '...' diff --git a/tox.ini b/tox.ini index bf9e8f13..98e067be 100644 --- a/tox.ini +++ b/tox.ini @@ -3,8 +3,10 @@ envlist = flake8 {pypy,py27,py33}-{twtrunk} {pypy,py26,py27,py33}-{trollius} - {py34}-{twtrunk,asyncio} - {pypy,py26,py27}-{tw121,tw132,twcurrent} + {py34,py35}-{twtrunk,asyncio} + py26-{tw121,tw132,tw154} + {pypy,py27}-{tw121,tw132,twcurrent} + {py33,py34,py35}-twcurrent [flake8] @@ -22,6 +24,7 @@ deps = twtrunk: https://github.com/twisted/twisted/archive/trunk.zip tw121: Twisted==12.1 tw132: Twisted==13.2 + tw154: Twisted==15.4 twcurrent: Twisted ; asyncio dependencies