merge stable into default

This commit is contained in:
Georg Brandl
2014-01-10 21:26:12 +01:00
11 changed files with 63 additions and 32 deletions

View File

@@ -14,7 +14,7 @@
from util import TestApp
from nose.tools import assert_equals
from nose.tools import assert_equal
app = env = None
@@ -64,6 +64,6 @@ def test_docinfo():
}
# I like this way of comparing dicts - easier to see the error.
for key in exampledocinfo:
yield assert_equals, exampledocinfo.get(key), expecteddocinfo.get(key)
yield assert_equal, exampledocinfo.get(key), expecteddocinfo.get(key)
# but then we still have to check for missing keys
yield assert_equals, set(expecteddocinfo.keys()), set(exampledocinfo.keys())
yield assert_equal, set(expecteddocinfo.keys()), set(exampledocinfo.keys())