From 423c422aca4614dff295c2cd628c3c206a89e9ba Mon Sep 17 00:00:00 2001 From: Christophe de Vienne Date: Tue, 24 Apr 2012 11:36:35 +0200 Subject: [PATCH] Python 3.2 port --- setup.cfg | 1 - tox.ini | 2 +- wsme/root.py | 20 +++++++++++--------- wsme/tests/test_api.py | 12 +++++++----- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/setup.cfg b/setup.cfg index d293a53..3e557f9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,6 +6,5 @@ tag_date = true release = egg_info -RDb '' [nosetests] -with-xunit = true with-coverage = true cover-package = wsme diff --git a/tox.ini b/tox.ini index 73c7c53..cde39bb 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,7 @@ deps = coverage transaction -commands=nosetests [] +commands=nosetests --verbose [] downloadcache=.tox/cache [testenv:py25simplejson] diff --git a/wsme/root.py b/wsme/root.py index 2a2c0e1..f401fc9 100644 --- a/wsme/root.py +++ b/wsme/root.py @@ -3,6 +3,7 @@ import sys import traceback import weakref import six +from six import u, b import webob @@ -12,7 +13,7 @@ from wsme.api import scan_api log = logging.getLogger(__name__) -html_body = """ +html_body = u("""