Account for added htmlutil package

git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@3791 e7d03fd6-7b0d-0410-9947-9c21f3af8025

setup.py

@@ -504,7 +504,7 @@ o a (Fast)CGI web interface (requires HTTP server)
                   },
        packages = ['linkcheck', 'linkcheck.logger', 'linkcheck.checker',
                    'linkcheck.director', 'linkcheck.configuration',
-                   'linkcheck.cache',
+                   'linkcheck.cache', 'linkcheck.htmlutil',
                    'linkcheck.dns', 'linkcheck.dns.rdtypes',
                    'linkcheck.dns.rdtypes.ANY', 'linkcheck.dns.rdtypes.IN',
                    'linkcheck.HtmlParser', 'linkcheck.ftpparse', ],

tests/test_linkname.py

@@ -19,7 +19,7 @@ Test linkname routines.
 """
 
 import unittest
-import linkcheck.linkname
+from linkcheck.htmlutil import linkname
 
 
 class TestLinkname (unittest.TestCase):
@@ -31,13 +31,13 @@ class TestLinkname (unittest.TestCase):
         """
         Helper function calling linkname.image_name().
         """
-        self.assertEqual(linkcheck.linkname.image_name(txt), expected)
+        self.assertEqual(linkname.image_name(txt), expected)
 
     def href_name_test (self, txt, expected):
         """
         Helper function calling linkname.href_name().
         """
-        self.assertEqual(linkcheck.linkname.href_name(txt), expected)
+        self.assertEqual(linkname.href_name(txt), expected)
 
     def test_image_name (self):
         """
@@ -72,3 +72,4 @@ def test_suite ():
 
 if __name__ == '__main__':
     unittest.main()
+

tests/test_linkparser.py

@@ -19,7 +19,7 @@ Test linkparser routines.
 """
 
 import unittest
-import linkcheck.linkparse
+from linkcheck.htmlutil import linkparse
 import linkcheck.HtmlParser.htmlsax
 
 
@@ -29,7 +29,7 @@ class TestLinkparser (unittest.TestCase):
     """
 
     def _test_one_link (self, content, url):
-        h = linkcheck.linkparse.LinkFinder(content)
+        h = linkparse.LinkFinder(content)
         self.assertEqual(len(h.urls), 0)
         p = linkcheck.HtmlParser.htmlsax.parser(h)
         h.parser = p
@@ -78,7 +78,7 @@ class TestLinkparser (unittest.TestCase):
         self._test_one_link(content % url, url)
 
     def test_comment_stripping (self):
-        strip = linkcheck.linkparse.strip_c_comments
+        strip = linkparse.strip_c_comments
         content = "/* url('http://example.org')*/"
         self.assertEqual(strip(content), "")
         content = "/* * * **/"