summaryrefslogtreecommitdiff
path: root/tests/test_multidict.py
diff options
context:
space:
mode:
authorpjenvey <devnull@localhost>2009-05-07 06:33:36 +0000
committerpjenvey <devnull@localhost>2009-05-07 06:33:36 +0000
commit1e62b90f2ab0d0f02c1b239371292e3b7dab02df (patch)
treece55df29dfe17d91f2732b3857024fe52c8e87a5 /tests/test_multidict.py
parent9a56546c530f2ea657d79b8a4b0ae17efcad17bd (diff)
downloadpaste-1e62b90f2ab0d0f02c1b239371292e3b7dab02df.tar.gz
convert to nose 0.11
Diffstat (limited to 'tests/test_multidict.py')
-rw-r--r--tests/test_multidict.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_multidict.py b/tests/test_multidict.py
index 75933a5..c99b10f 100644
--- a/tests/test_multidict.py
+++ b/tests/test_multidict.py
@@ -2,11 +2,11 @@
# (c) 2007 Ian Bicking and Philip Jenvey; written for Paste (http://pythonpaste.org)
# Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
import cgi
+from nose.tools import assert_raises
from StringIO import StringIO
from paste.fixture import TestApp
from paste.wsgiwrappers import WSGIRequest
from paste.util.multidict import MultiDict, UnicodeMultiDict
-from py.test import raises
def test_dict():
d = MultiDict({'a': 1})
@@ -20,7 +20,7 @@ def test_dict():
assert d.items() == [('a', 1), ('c', 3), ('b', 4)]
d.add('b', 5)
- raises(KeyError, 'd.getone("b")')
+ assert_raises(KeyError, d.getone, "b")
assert d.getall('b') == [4, 5]
assert d.items() == [('a', 1), ('c', 3), ('b', 4), ('b', 5)]
@@ -91,7 +91,7 @@ def _test_unicode_dict(decode_param_names=False):
map(assert_unicode_item, d.items())
d.add('b', '5 test')
- raises(KeyError, 'd.getone("b")')
+ assert_raises(KeyError, d.getone, "b")
assert d.getall('b') == [u'4 test', u'5 test']
map(assert_unicode, d.getall('b'))
assert d.items() == [('a', u'a test'), ('c', u'3 test'), ('b', u'4 test'),