Hopiu/linkchecker
1
0
Fork 0
mirror of https://github.com/Hopiu/linkchecker.git synced 2026-05-05 05:04:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Assertions should be earlier.

Browse source
This commit is contained in:
Bastian Kleineidam 2014-03-14 20:26:11 +01:00
parent 0989624333
commit c51caf1133
2 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
linkcheck/checker/urlbase.py
View file

@ -130,13 +130,20 @@ class UrlBase (object):
Initialize internal data.
"""
self.base_ref = base_ref
if self.base_ref is not None:
assert isinstance(self.base_ref, unicode), repr(self.base_ref)
self.base_url = base_url.strip() if base_url else base_url
if self.base_url is not None:
assert isinstance(self.base_url, unicode), repr(self.base_url)
self.parent_url = parent_url
if self.parent_url is not None:
assert isinstance(self.parent_url, unicode), repr(self.parent_url)
self.recursion_level = recursion_level
self.aggregate = aggregate
self.line = line
self.column = column
self.name = name
assert isinstance(self.name, unicode), repr(self.name)
self.encoding = url_encoding
self.charset = None
self.extern = extern
@ -294,6 +301,8 @@ class UrlBase (object):
# remove anchor from cached target url since we assume
# URLs with different anchors to have the same content
self.cache_url = urlutil.urlunsplit(self.urlparts[:4]+[u''])
if self.cache_url is not None:
assert isinstance(self.cache_url, unicode), repr(self.cache_url)
def check_syntax (self):
"""
@ -390,6 +399,8 @@ class UrlBase (object):
self.urlparts[1] = host
# safe anchor for later checking
self.anchor = self.urlparts[4]
if self.anchor is not None:
assert isinstance(self.anchor, unicode), repr(self.anchor)
def check_obfuscated_ip (self):
"""Warn if host of this URL is obfuscated IP address."""
@ -661,19 +672,7 @@ class UrlBase (object):
"""
Return serialized url check data as unicode string.
"""
sep = unicode_safe(sep)
if self.base_url is not None:
assert isinstance(self.base_url, unicode), repr(self.base_url)
if self.parent_url is not None:
assert isinstance(self.parent_url, unicode), repr(self.parent_url)
if self.base_ref is not None:
assert isinstance(self.base_ref, unicode), repr(self.base_ref)
assert isinstance(self.name, unicode), repr(self.name)
if self.anchor is not None:
assert isinstance(self.anchor, unicode), repr(self.anchor)
if self.cache_url is not None:
assert isinstance(self.cache_url, unicode), repr(self.cache_url)
return sep.join([
return unicode_safe(sep).join([
u"%s link" % self.scheme,
u"base_url=%r" % self.base_url,
u"parent_url=%r" % self.parent_url,

12
tests/test_urlbuild.py
View file

@ -21,8 +21,8 @@ Test url build method from url data objects.
import unittest
import linkcheck.configuration
import linkcheck.director
import linkcheck.checker.httpurl
import linkcheck.checker.urlbase
from linkcheck.checker import get_url_from
def get_test_aggregate ():
@ -44,10 +44,9 @@ class TestUrlBuild (unittest.TestCase):
base_url = "http://foo"
recursion_level = 0
aggregate = get_test_aggregate()
o = linkcheck.checker.httpurl.HttpUrl(base_url, recursion_level,
aggregate, parent_url=parent_url)
o = get_url_from(base_url, recursion_level, aggregate, parent_url=parent_url)
o.build_url()
self.assertEqual(o.url, 'http://foo')
self.assertEqual(o.url, u'http://foo')
def test_urljoin (self):
parent_url = "http://localhost:8001/test"
@ -60,7 +59,7 @@ class TestUrlBuild (unittest.TestCase):
base_url = "?c=d"
recursion_level = 0
aggregate = get_test_aggregate()
o = linkcheck.checker.fileurl.FileUrl(base_url, recursion_level,
o = get_url_from(base_url, recursion_level,
aggregate, parent_url=parent_url)
o.build_url()
self.assertEqual(o.url, parent_url)
@ -70,7 +69,6 @@ class TestUrlBuild (unittest.TestCase):
base_url = u'#usemap'
recursion_level = 0
aggregate = get_test_aggregate()
o = linkcheck.checker.httpurl.HttpUrl(base_url, recursion_level,
aggregate, parent_url=parent_url)
o = get_url_from(base_url, recursion_level, aggregate, parent_url=parent_url)
o.build_url()
self.assertEqual(o.url, parent_url+base_url)