[Checkins] SVN: ZConfig/trunk/ZConfig/ Avoid deprecation warnings for unittest assertions.
Marius Gedminas
cvs-admin at zope.org
Thu Feb 14 10:59:36 UTC 2013
Log message for revision 129384:
Avoid deprecation warnings for unittest assertions.
Changed:
U ZConfig/trunk/ZConfig/components/logger/tests/test_logger.py
U ZConfig/trunk/ZConfig/tests/support.py
U ZConfig/trunk/ZConfig/tests/test_cfgimports.py
U ZConfig/trunk/ZConfig/tests/test_cmdline.py
U ZConfig/trunk/ZConfig/tests/test_config.py
U ZConfig/trunk/ZConfig/tests/test_cookbook.py
U ZConfig/trunk/ZConfig/tests/test_datatypes.py
U ZConfig/trunk/ZConfig/tests/test_loader.py
U ZConfig/trunk/ZConfig/tests/test_schema.py
U ZConfig/trunk/ZConfig/tests/test_subst.py
-=-
Modified: ZConfig/trunk/ZConfig/components/logger/tests/test_logger.py
===================================================================
--- ZConfig/trunk/ZConfig/components/logger/tests/test_logger.py 2013-02-14 10:56:16 UTC (rev 129383)
+++ ZConfig/trunk/ZConfig/components/logger/tests/test_logger.py 2013-02-14 10:59:36 UTC (rev 129384)
@@ -108,7 +108,7 @@
def get_config(self, text):
conf, handler = ZConfig.loadConfigFile(self.get_schema(),
StringIO.StringIO(text))
- self.assert_(not handler)
+ self.assertTrue(not handler)
return conf
@@ -155,15 +155,14 @@
def test_config_without_logger(self):
conf = self.get_config("")
- self.assert_(conf.eventlog is None)
+ self.assertTrue(conf.eventlog is None)
def test_config_without_handlers(self):
logger = self.check_simple_logger("<eventlog/>")
# Make sure there's a NullHandler, since a warning gets
# printed if there are no handlers:
self.assertEqual(len(logger.handlers), 1)
- self.assert_(isinstance(logger.handlers[0],
- loghandler.NullHandler))
+ self.assertTrue(isinstance(logger.handlers[0], loghandler.NullHandler))
def test_with_logfile(self):
fn = self.mktemp()
@@ -175,7 +174,7 @@
"</eventlog>" % fn)
logfile = logger.handlers[0]
self.assertEqual(logfile.level, logging.DEBUG)
- self.assert_(isinstance(logfile, loghandler.FileHandler))
+ self.assertTrue(isinstance(logfile, loghandler.FileHandler))
logger.removeHandler(logfile)
logfile.close()
@@ -199,7 +198,7 @@
self.assertEqual(logfile.level, logging.DEBUG)
self.assertEqual(logfile.backupCount, 10)
self.assertEqual(logfile.maxBytes, 5*1024*1024)
- self.assert_(isinstance(logfile, loghandler.RotatingFileHandler))
+ self.assertTrue(isinstance(logfile, loghandler.RotatingFileHandler))
logger.removeHandler(logfile)
logfile.close()
@@ -217,7 +216,7 @@
self.assertEqual(logfile.level, logging.DEBUG)
self.assertEqual(logfile.backupCount, 11)
self.assertEqual(logfile.interval, 86400)
- self.assert_(isinstance(logfile, loghandler.TimedRotatingFileHandler))
+ self.assertTrue(isinstance(logfile, loghandler.TimedRotatingFileHandler))
logger.removeHandler(logfile)
logfile.close()
@@ -236,7 +235,7 @@
self.assertEqual(logfile.level, logging.DEBUG)
self.assertEqual(logfile.backupCount, 11)
self.assertEqual(logfile.interval, 86400*3)
- self.assert_(isinstance(logfile, loghandler.TimedRotatingFileHandler))
+ self.assertTrue(isinstance(logfile, loghandler.TimedRotatingFileHandler))
logger.removeHandler(logfile)
logfile.close()
@@ -265,7 +264,7 @@
</logfile>
</eventlog>
""" % name.upper())
- self.assert_(conf.eventlog is not None)
+ self.assertTrue(conf.eventlog is not None)
# The factory has already been created; make sure it picks up
# the stderr we set here when we create the logger and
# handlers:
@@ -276,7 +275,7 @@
finally:
setattr(sys, name, old_stream)
logger.warn("woohoo!")
- self.assert_(sio.getvalue().find("woohoo!") >= 0)
+ self.assertTrue(sio.getvalue().find("woohoo!") >= 0)
def test_custom_formatter(self):
old_stream = sys.stdout
@@ -299,8 +298,8 @@
raise KeyError
except KeyError:
logger.exception("testing a KeyError")
- self.assert_(sio.getvalue().find("KeyError") >= 0)
- self.assert_(sio.getvalue().find("Don't panic") >= 0)
+ self.assertTrue(sio.getvalue().find("KeyError") >= 0)
+ self.assertTrue(sio.getvalue().find("Don't panic") >= 0)
def test_with_syslog(self):
logger = self.check_simple_logger("<eventlog>\n"
@@ -311,7 +310,7 @@
"</eventlog>")
syslog = logger.handlers[0]
self.assertEqual(syslog.level, logging.ERROR)
- self.assert_(isinstance(syslog, loghandler.SysLogHandler))
+ self.assertTrue(isinstance(syslog, loghandler.SysLogHandler))
def test_with_http_logger_localhost(self):
logger = self.check_simple_logger("<eventlog>\n"
@@ -327,7 +326,7 @@
self.assertEqual(handler.url, "/")
self.assertEqual(handler.level, logging.ERROR)
self.assertEqual(handler.method, "POST")
- self.assert_(isinstance(handler, loghandler.HTTPHandler))
+ self.assertTrue(isinstance(handler, loghandler.HTTPHandler))
def test_with_http_logger_remote_host(self):
logger = self.check_simple_logger("<eventlog>\n"
@@ -343,7 +342,7 @@
self.assertEqual(handler.url, "/log/")
self.assertEqual(handler.level, logging.NOTSET)
self.assertEqual(handler.method, "GET")
- self.assert_(isinstance(handler, loghandler.HTTPHandler))
+ self.assertTrue(isinstance(handler, loghandler.HTTPHandler))
def test_with_email_notifier(self):
logger = self.check_simple_logger("<eventlog>\n"
@@ -377,7 +376,7 @@
raise
else:
# This path must only be reached with python >=2.6
- self.assert_(sys.version_info >= (2, 6))
+ self.assertTrue(sys.version_info >= (2, 6))
handler = logger.handlers[0]
self.assertEqual(handler.toaddrs, ["sysadmin at example.com"])
self.assertEqual(handler.fromaddr, "zlog-user at example.com")
@@ -410,10 +409,10 @@
def check_simple_logger(self, text, level=logging.INFO):
conf = self.get_config(text)
- self.assert_(conf.eventlog is not None)
+ self.assertTrue(conf.eventlog is not None)
self.assertEqual(conf.eventlog.level, level)
logger = conf.eventlog()
- self.assert_(isinstance(logger, logging.Logger))
+ self.assertTrue(isinstance(logger, logging.Logger))
self.assertEqual(len(logger.handlers), 1)
return logger
@@ -502,11 +501,11 @@
text1 = read_file(nfn1)
text2 = read_file(nfn2)
text3 = read_file(fn)
- self.assert_("message 1" in text1)
- self.assert_("message 2" in text1)
- self.assert_("message 3" in text2)
- self.assert_("message 4" in text2)
- self.assert_("message 5" in text3)
+ self.assertTrue("message 1" in text1)
+ self.assertTrue("message 2" in text1)
+ self.assertTrue("message 3" in text2)
+ self.assertTrue("message 4" in text2)
+ self.assertTrue("message 5" in text3)
def test_logfile_reopening(self):
#
@@ -548,9 +547,9 @@
for fn in paths:
fn1 = fn + ".1"
fn2 = fn + ".2"
- self.assert_(os.path.isfile(fn), "%r must exist" % fn)
- self.assert_(os.path.isfile(fn1), "%r must exist" % fn1)
- self.assert_(os.path.isfile(fn2), "%r must exist" % fn2)
+ self.assertTrue(os.path.isfile(fn), "%r must exist" % fn)
+ self.assertTrue(os.path.isfile(fn1), "%r must exist" % fn1)
+ self.assertTrue(os.path.isfile(fn2), "%r must exist" % fn2)
#
# Clean up:
for logger in conf.loggers:
@@ -626,11 +625,11 @@
#
# We should now have all nine files:
for fn in paths:
- self.assert_(os.path.isfile(fn), "%r must exist" % fn)
+ self.assertTrue(os.path.isfile(fn), "%r must exist" % fn)
for fn in npaths1:
- self.assert_(os.path.isfile(fn), "%r must exist" % fn)
+ self.assertTrue(os.path.isfile(fn), "%r must exist" % fn)
for fn in npaths2:
- self.assert_(os.path.isfile(fn), "%r must exist" % fn)
+ self.assertTrue(os.path.isfile(fn), "%r must exist" % fn)
#
# Clean up:
for logger in conf.loggers:
Modified: ZConfig/trunk/ZConfig/tests/support.py
===================================================================
--- ZConfig/trunk/ZConfig/tests/support.py 2013-02-14 10:56:16 UTC (rev 129383)
+++ ZConfig/trunk/ZConfig/tests/support.py 2013-02-14 10:59:36 UTC (rev 129384)
@@ -57,7 +57,7 @@
def load_schema(self, relurl):
self.url = urljoin(CONFIG_BASE, relurl)
self.schema = ZConfig.loadSchema(self.url)
- self.assert_(self.schema.issection())
+ self.assertTrue(self.schema.issection())
return self.schema
def load_schema_text(self, text, url=None):
Modified: ZConfig/trunk/ZConfig/tests/test_cfgimports.py
===================================================================
--- ZConfig/trunk/ZConfig/tests/test_cfgimports.py 2013-02-14 10:56:16 UTC (rev 129383)
+++ ZConfig/trunk/ZConfig/tests/test_cfgimports.py 2013-02-14 10:59:36 UTC (rev 129384)
@@ -35,7 +35,7 @@
StringIO("%import ZConfig.tests.library.widget\n"))
# make sure we now have a "private" schema object; the only
# way to get it is from the loader itself
- self.assert_(schema is not loader.schema)
+ self.assertTrue(schema is not loader.schema)
# make sure component types are only found on the private schema:
loader.schema.gettype("widget-b")
self.assertRaises(ZConfig.SchemaError, schema.gettype, "widget-b")
Modified: ZConfig/trunk/ZConfig/tests/test_cmdline.py
===================================================================
--- ZConfig/trunk/ZConfig/tests/test_cmdline.py 2013-02-14 10:56:16 UTC (rev 129383)
+++ ZConfig/trunk/ZConfig/tests/test_cmdline.py 2013-02-14 10:59:36 UTC (rev 129384)
@@ -44,8 +44,8 @@
("section/innerkey=spoogey", None)]
bag = self.create_config_loader(schema).cook()
# Test a variety of queries on the OptionBag:
- self.assert_("mykey" in bag)
- self.assert_("another" not in bag)
+ self.assertTrue("mykey" in bag)
+ self.assertTrue("another" not in bag)
self.assertEqual(bag.get_section_info("st", None), None)
self.assertEqual(bag.get_section_info("st", "missing-sect"), None)
# Consume everything in the OptionBag:
@@ -54,8 +54,8 @@
self.assertEqual(len(L), 1)
self.assertEqual(s, "splat!")
bag2 = bag.get_section_info("st", "section")
- self.assert_("innerkey" in bag2)
- self.assert_("another" not in bag2)
+ self.assertTrue("innerkey" in bag2)
+ self.assertTrue("another" not in bag2)
L = bag2.get_key("innerkey")
s, pos = L[0]
self.assertEqual(len(L), 1)
Modified: ZConfig/trunk/ZConfig/tests/test_config.py
===================================================================
--- ZConfig/trunk/ZConfig/tests/test_config.py 2013-02-14 10:56:16 UTC (rev 129383)
+++ ZConfig/trunk/ZConfig/tests/test_config.py 2013-02-14 10:59:36 UTC (rev 129384)
@@ -41,9 +41,9 @@
self.conf, self.handlers = ZConfig.loadConfig(self.get_schema(), url)
conf = self.conf
#self.assertEqual(conf.url, url)
- self.assert_(conf.getSectionName() is None)
- self.assert_(conf.getSectionType() is None)
- #self.assert_(conf.delegate is None)
+ self.assertTrue(conf.getSectionName() is None)
+ self.assertTrue(conf.getSectionType() is None)
+ #self.assertTrue(conf.delegate is None)
return conf
def loadtext(self, text):
@@ -61,12 +61,12 @@
self.assertEqual(conf.neg_int, -2)
self.assertEqual(conf.float_var, 12.02)
self.assertEqual(conf.var1, 'abc')
- self.assert_(conf.true_var_1)
- self.assert_(conf.true_var_2)
- self.assert_(conf.true_var_3)
- self.assert_(not conf.false_var_1)
- self.assert_(not conf.false_var_2)
- self.assert_(not conf.false_var_3)
+ self.assertTrue(conf.true_var_1)
+ self.assertTrue(conf.true_var_2)
+ self.assertTrue(conf.true_var_3)
+ self.assertTrue(not conf.false_var_1)
+ self.assertTrue(not conf.false_var_2)
+ self.assertTrue(not conf.false_var_3)
self.assertEqual(conf.list_1, [])
self.assertEqual(conf.list_2, ['abc'])
self.assertEqual(conf.list_3, ['abc', 'def', 'ghi'])
@@ -97,12 +97,12 @@
if sect.getSectionName() == "name"][0]
self.assertEqual(sect.var, "bar")
self.assertEqual(sect.var_one, "splat")
- self.assert_(sect.var_three is None)
+ self.assertTrue(sect.var_three is None)
sect = [sect for sect in conf.sections
if sect.getSectionName() == "delegate"][0]
self.assertEqual(sect.var, "spam")
self.assertEqual(sect.var_two, "stuff")
- self.assert_(sect.var_three is None)
+ self.assertTrue(sect.var_three is None)
def test_include(self):
conf = self.load("include.conf")
Modified: ZConfig/trunk/ZConfig/tests/test_cookbook.py
===================================================================
--- ZConfig/trunk/ZConfig/tests/test_cookbook.py 2013-02-14 10:56:16 UTC (rev 129383)
+++ ZConfig/trunk/ZConfig/tests/test_cookbook.py 2013-02-14 10:59:36 UTC (rev 129384)
@@ -60,7 +60,7 @@
self.assertEqual(config.userinfo.userid, 42)
self.assertEqual(config.userinfo.username, "foouser")
self.assertEqual(config.userinfo.passwd, "yeah-right")
- self.assert_(not hasattr(config.userinfo, "password"))
+ self.assertTrue(not hasattr(config.userinfo, "password"))
def test_suite():
Modified: ZConfig/trunk/ZConfig/tests/test_datatypes.py
===================================================================
--- ZConfig/trunk/ZConfig/tests/test_datatypes.py 2013-02-14 10:56:16 UTC (rev 129383)
+++ ZConfig/trunk/ZConfig/tests/test_datatypes.py 2013-02-14 10:59:36 UTC (rev 129384)
@@ -58,7 +58,7 @@
def test_datatype_boolean(self):
convert = self.types.get("boolean")
- check = self.assert_
+ check = self.assertTrue
raises = self.assertRaises
check(convert("on"))
@@ -78,7 +78,7 @@
raises = self.assertRaises
eq(convert("1"), 1.0)
- self.assert_(type(convert(1)) is type(1.0))
+ self.assertTrue(type(convert(1)) is type(1.0))
eq(convert("1.1"), 1.1)
eq(convert("50.50"), 50.50)
eq(convert("-50.50"), -50.50)
@@ -122,12 +122,12 @@
def assert_ascii_equal(self, convert, value):
v = convert(value)
self.assertEqual(v, value)
- self.assert_(isinstance(v, str))
+ self.assertTrue(isinstance(v, str))
if have_unicode:
unicode_value = unicode(value)
v = convert(unicode_value)
self.assertEqual(v, value)
- self.assert_(isinstance(v, str))
+ self.assertTrue(isinstance(v, str))
def check_never_namelike(self, convert):
raises = self.assertRaises
@@ -278,8 +278,8 @@
self.assertEqual(a1.family, socket.AF_UNIX)
self.assertEqual(a2.family, socket.AF_UNIX)
else:
- self.assert_(a1.family is None)
- self.assert_(a2.family is None)
+ self.assertTrue(a1.family is None)
+ self.assertTrue(a2.family is None)
def test_ipaddr_or_hostname(self):
convert = self.types.get('ipaddr-or-hostname')
Modified: ZConfig/trunk/ZConfig/tests/test_loader.py
===================================================================
--- ZConfig/trunk/ZConfig/tests/test_loader.py 2013-02-14 10:56:16 UTC (rev 129383)
+++ ZConfig/trunk/ZConfig/tests/test_loader.py 2013-02-14 10:59:36 UTC (rev 129384)
@@ -53,7 +53,7 @@
url = ZConfig.url.urljoin(CONFIG_BASE, "simple.xml")
schema1 = loader.loadURL(url)
schema2 = loader.loadURL(url)
- self.assert_(schema1 is schema2)
+ self.assertTrue(schema1 is schema2)
def test_simple_import_with_cache(self):
loader = ZConfig.loader.SchemaLoader()
@@ -65,7 +65,7 @@
"</schema>")
url2 = ZConfig.url.urljoin(CONFIG_BASE, "stringio")
schema2 = loader.loadFile(sio, url2)
- self.assert_(schema1.gettype("type-a") is schema2.gettype("type-a"))
+ self.assertTrue(schema1.gettype("type-a") is schema2.gettype("type-a"))
def test_simple_import_using_prefix(self):
self.load_schema_text("""\
@@ -98,7 +98,7 @@
except ZConfig.SchemaResourceError as e:
self.assertEqual(e.filename, "component.xml")
self.assertEqual(e.package, "ZConfig.tests.test_loader")
- self.assert_(e.path is None)
+ self.assertTrue(e.path is None)
# make sure the str() doesn't raise an unexpected exception
str(e)
else:
@@ -110,7 +110,7 @@
" <import package='ZConfig.tests.library.widget'/>"
"</schema>")
schema = loader.loadFile(sio)
- self.assert_(schema.gettype("widget-a") is not None)
+ self.assertTrue(schema.gettype("widget-a") is not None)
def test_import_from_package_with_file(self):
loader = ZConfig.loader.SchemaLoader()
@@ -119,7 +119,7 @@
" file='extra.xml' />"
"</schema>")
schema = loader.loadFile(sio)
- self.assert_(schema.gettype("extra-type") is not None)
+ self.assertTrue(schema.gettype("extra-type") is not None)
def test_import_from_package_extra_directory(self):
loader = ZConfig.loader.SchemaLoader()
@@ -128,7 +128,7 @@
" file='extras.xml' />"
"</schema>")
schema = loader.loadFile(sio)
- self.assert_(schema.gettype("extra-thing") is not None)
+ self.assertTrue(schema.gettype("extra-thing") is not None)
def test_import_from_package_with_missing_file(self):
loader = ZConfig.loader.SchemaLoader()
@@ -141,7 +141,7 @@
except ZConfig.SchemaResourceError as e:
self.assertEqual(e.filename, "notthere.xml")
self.assertEqual(e.package, "ZConfig.tests.library.widget")
- self.assert_(e.path)
+ self.assertTrue(e.path)
# make sure the str() doesn't raise an unexpected exception
str(e)
else:
@@ -230,24 +230,24 @@
("file:///abc/def", "frag"))
def test_isPath(self):
- assert_ = self.assert_
+ assertTrue = self.assertTrue
isPath = ZConfig.loader.BaseLoader().isPath
- assert_(isPath("abc"))
- assert_(isPath("abc/def"))
- assert_(isPath("/abc"))
- assert_(isPath("/abc/def"))
- assert_(isPath(r"\abc"))
- assert_(isPath(r"\abc\def"))
- assert_(isPath(r"c:\abc\def"))
- assert_(isPath("/ab:cd"))
- assert_(isPath(r"\ab:cd"))
- assert_(isPath("long name with spaces"))
- assert_(isPath("long name:with spaces"))
- assert_(not isPath("ab:cd"))
- assert_(not isPath("http://www.example.com/"))
- assert_(not isPath("http://www.example.com/sample.conf"))
- assert_(not isPath("file:///etc/zope/zope.conf"))
- assert_(not isPath("file:///c|/foo/bar.conf"))
+ assertTrue(isPath("abc"))
+ assertTrue(isPath("abc/def"))
+ assertTrue(isPath("/abc"))
+ assertTrue(isPath("/abc/def"))
+ assertTrue(isPath(r"\abc"))
+ assertTrue(isPath(r"\abc\def"))
+ assertTrue(isPath(r"c:\abc\def"))
+ assertTrue(isPath("/ab:cd"))
+ assertTrue(isPath(r"\ab:cd"))
+ assertTrue(isPath("long name with spaces"))
+ assertTrue(isPath("long name:with spaces"))
+ assertTrue(not isPath("ab:cd"))
+ assertTrue(not isPath("http://www.example.com/"))
+ assertTrue(not isPath("http://www.example.com/sample.conf"))
+ assertTrue(not isPath("file:///etc/zope/zope.conf"))
+ assertTrue(not isPath("file:///c|/foo/bar.conf"))
class TestNonExistentResources(unittest.TestCase):
@@ -322,7 +322,7 @@
''')
schema = ZConfig.loadSchemaFile(sio)
t = schema.gettype("sample")
- self.failIf(t.isabstract())
+ self.assertFalse(t.isabstract())
def test_zip_import_component_from_config(self):
sio = StringIO('''
Modified: ZConfig/trunk/ZConfig/tests/test_schema.py
===================================================================
--- ZConfig/trunk/ZConfig/tests/test_schema.py 2013-02-14 10:56:16 UTC (rev 129383)
+++ ZConfig/trunk/ZConfig/tests/test_schema.py 2013-02-14 10:59:36 UTC (rev 129384)
@@ -62,7 +62,7 @@
eq(conf.float_var, 12.02)
eq(conf.neg_int, -2)
- check = self.assert_
+ check = self.assertTrue
check(conf.true_var_1)
check(conf.true_var_2)
check(conf.true_var_3)
@@ -115,9 +115,9 @@
sample 42
</foo>
""")
- self.assert_(isinstance(conf, MySection))
+ self.assertTrue(isinstance(conf, MySection))
o1 = conf.conf.sect
- self.assert_(isinstance(o1, MySection))
+ self.assertTrue(isinstance(o1, MySection))
self.assertEqual(o1.conf.sample, 42)
def test_empty_sections(self):
@@ -133,8 +133,8 @@
</section>
<section s2/>
""")
- self.assert_(conf.s1 is not None)
- self.assert_(conf.s2 is not None)
+ self.assertTrue(conf.s1 is not None)
+ self.assertTrue(conf.s2 is not None)
self.assertEqual(get_section_attributes(conf),
["s1", "s2"])
@@ -355,15 +355,15 @@
""")
# check the types that get defined
t = schema.gettype("group")
- self.assert_(t.isabstract())
+ self.assertTrue(t.isabstract())
t1 = schema.gettype("t1")
- self.assert_(not t1.isabstract())
- self.assert_(t.getsubtype("t1") is t1)
+ self.assertTrue(not t1.isabstract())
+ self.assertTrue(t.getsubtype("t1") is t1)
t2 = schema.gettype("t2")
- self.assert_(not t2.isabstract())
- self.assert_(t.getsubtype("t2") is t2)
+ self.assertTrue(not t2.isabstract())
+ self.assertTrue(t.getsubtype("t2") is t2)
self.assertRaises(ZConfig.ConfigurationError, t.getsubtype, "group")
- self.assert_(t1 is not t2)
+ self.assertTrue(t1 is not t2)
# try loading a config that relies on this schema
conf = self.load_config_text(schema, """\
<t1/>
@@ -384,10 +384,10 @@
eq(conf.g[3].k2, "value2")
# white box:
- self.assert_(conf.g[0].getSectionDefinition() is t1)
- self.assert_(conf.g[1].getSectionDefinition() is t1)
- self.assert_(conf.g[2].getSectionDefinition() is t2)
- self.assert_(conf.g[3].getSectionDefinition() is t2)
+ self.assertTrue(conf.g[0].getSectionDefinition() is t1)
+ self.assertTrue(conf.g[1].getSectionDefinition() is t1)
+ self.assertTrue(conf.g[2].getSectionDefinition() is t2)
+ self.assertTrue(conf.g[3].getSectionDefinition() is t2)
def test_abstracttype_extension(self):
schema = self.load_schema_text("""\
@@ -398,7 +398,7 @@
</schema>
""")
abstype = schema.gettype("group")
- self.assert_(schema.gettype("extra") is abstype.getsubtype("extra"))
+ self.assertTrue(schema.gettype("extra") is abstype.getsubtype("extra"))
# make sure we can use the extension in a config:
conf = self.load_config_text(schema, "<extra thing/>")
@@ -590,7 +590,7 @@
orig = conf.empty
new = []
conf.empty = new
- self.assert_(conf.empty is new)
+ self.assertTrue(conf.empty is new)
def test_simple_anonymous_section(self):
schema = self.load_schema_text("""\
Modified: ZConfig/trunk/ZConfig/tests/test_subst.py
===================================================================
--- ZConfig/trunk/ZConfig/tests/test_subst.py 2013-02-14 10:56:16 UTC (rev 129383)
+++ ZConfig/trunk/ZConfig/tests/test_subst.py 2013-02-14 10:59:36 UTC (rev 129384)
@@ -80,14 +80,14 @@
self.assertEqual(substitute("$name", d), "$value")
def test_isname(self):
- self.assert_(isname("abc"))
- self.assert_(isname("abc_def"))
- self.assert_(isname("_abc"))
- self.assert_(isname("abc_"))
- self.assert_(not isname("abc-def"))
- self.assert_(not isname("-def"))
- self.assert_(not isname("abc-"))
- self.assert_(not isname(""))
+ self.assertTrue(isname("abc"))
+ self.assertTrue(isname("abc_def"))
+ self.assertTrue(isname("_abc"))
+ self.assertTrue(isname("abc_"))
+ self.assertTrue(not isname("abc-def"))
+ self.assertTrue(not isname("-def"))
+ self.assertTrue(not isname("abc-"))
+ self.assertTrue(not isname(""))
def test_suite():
More information about the checkins
mailing list