[Zodb-checkins] CVS: Packages/ZConfig/tests - test_schema.py:1.1.2.33

Fred L. Drake, Jr. fred@zope.com
Tue, 24 Dec 2002 15:49:20 -0500


Update of /cvs-repository/Packages/ZConfig/tests
In directory cvs.zope.org:/tmp/cvs-serv10585

Modified Files:
      Tag: zconfig-schema-devel-branch
	test_schema.py 
Log Message:
Use the ZConfig.url URL helpers.


=== Packages/ZConfig/tests/test_schema.py 1.1.2.32 => 1.1.2.33 ===
--- Packages/ZConfig/tests/test_schema.py:1.1.2.32	Tue Dec 24 13:36:12 2002
+++ Packages/ZConfig/tests/test_schema.py	Tue Dec 24 15:49:19 2002
@@ -15,11 +15,11 @@
 
 import StringIO
 import unittest
-import urlparse
 
 import ZConfig
 
 from ZConfig.loader import ConfigLoader
+from ZConfig.url import urljoin
 from ZConfig.tests.test_config import CONFIG_BASE
 
 
@@ -44,7 +44,7 @@
         return schema, conf
 
     def load_schema(self, relurl):
-        self.url = urlparse.urljoin(CONFIG_BASE, relurl)
+        self.url = urljoin(CONFIG_BASE, relurl)
         self.schema = ZConfig.loadSchema(self.url)
         self.assert_(self.schema.issection())
         return self.schema
@@ -55,7 +55,7 @@
         return self.schema
 
     def load_config(self, schema, conf_url, num_handlers=0):
-        conf_url = urlparse.urljoin(CONFIG_BASE, conf_url)
+        conf_url = urljoin(CONFIG_BASE, conf_url)
         self.conf, self.handlers = ConfigLoader(schema).loadURL(conf_url)
         self.assertEqual(len(self.handlers), num_handlers)
         return self.conf