From 7a769024d8c398e59e8ab870a37169e02f209251 Mon Sep 17 00:00:00 2001 From: calvin Date: Fri, 27 Aug 2004 12:52:08 +0000 Subject: [PATCH] adjust to new repr() url git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@1536 e7d03fd6-7b0d-0410-9947-9c21f3af8025 --- linkcheck/ftests/data/anchor.html.result | 4 ++-- linkcheck/ftests/data/base1.html.result | 6 +++--- linkcheck/ftests/data/base2.html.result | 4 ++-- linkcheck/ftests/data/base3.html.result | 4 ++-- linkcheck/ftests/data/file.asc.result | 2 +- linkcheck/ftests/data/file.css.result | 6 +++--- linkcheck/ftests/data/file.html.result | 14 +++++++------- linkcheck/ftests/data/file.txt.result | 2 +- linkcheck/ftests/data/frames.html.result | 6 +++--- linkcheck/ftests/data/http.html.result | 12 ++++++------ linkcheck/ftests/test_error.py | 16 ++++++++-------- linkcheck/ftests/test_file.py | 8 ++++---- linkcheck/ftests/test_ftp.py | 14 +++++++------- linkcheck/ftests/test_https.py | 2 +- linkcheck/ftests/test_mail.py | 22 +++++++++++----------- linkcheck/ftests/test_news.py | 16 ++++++++-------- linkcheck/ftests/test_telnet.py | 8 ++++---- 17 files changed, 73 insertions(+), 73 deletions(-) diff --git a/linkcheck/ftests/data/anchor.html.result b/linkcheck/ftests/data/anchor.html.result index 14776f6f..1309b049 100644 --- a/linkcheck/ftests/data/anchor.html.result +++ b/linkcheck/ftests/data/anchor.html.result @@ -1,9 +1,9 @@ -url file://%(curdir)s/linkcheck/ftests/data/anchor.html +url 'file://%(curdir)s/linkcheck/ftests/data/anchor.html' cache key file://%(curdir)s/linkcheck/ftests/data/anchor.html real url file://%(curdir)s/linkcheck/ftests/data/anchor.html valid -url #myid +url '#myid' cache key file://%(curdir)s/linkcheck/ftests/data/anchor.html#myid real url file://%(curdir)s/linkcheck/ftests/data/anchor.html name Bla diff --git a/linkcheck/ftests/data/base1.html.result b/linkcheck/ftests/data/base1.html.result index 11def645..77e60abc 100644 --- a/linkcheck/ftests/data/base1.html.result +++ b/linkcheck/ftests/data/base1.html.result @@ -1,14 +1,14 @@ -url file://%(curdir)s/linkcheck/ftests/data/base1.html +url 'file://%(curdir)s/linkcheck/ftests/data/base1.html' cache key file://%(curdir)s/linkcheck/ftests/data/base1.html real url file://%(curdir)s/linkcheck/ftests/data/base1.html valid -url base2.html +url 'base2.html' cache key file://%(curdir)s/linkcheck/ftests/data/base2.html real url file://%(curdir)s/linkcheck/ftests/data/base2.html valid -url base2.html (cached) +url 'base2.html' (cached) cache key file://%(curdir)s/linkcheck/ftests/data/base2.html real url file://%(curdir)s/linkcheck/ftests/data/base2.html valid diff --git a/linkcheck/ftests/data/base2.html.result b/linkcheck/ftests/data/base2.html.result index 7a74a623..b3a662b7 100644 --- a/linkcheck/ftests/data/base2.html.result +++ b/linkcheck/ftests/data/base2.html.result @@ -1,9 +1,9 @@ -url file://%(curdir)s/linkcheck/ftests/data/base2.html +url 'file://%(curdir)s/linkcheck/ftests/data/base2.html' cache key file://%(curdir)s/linkcheck/ftests/data/base2.html real url file://%(curdir)s/linkcheck/ftests/data/base2.html valid -url test.txt +url 'test.txt' cache key file://%(curdir)s/linkcheck/ftests/data/base/test.txt real url file://%(curdir)s/linkcheck/ftests/data/base/test.txt baseurl file://%(curdir)s/linkcheck/ftests/data/base/ diff --git a/linkcheck/ftests/data/base3.html.result b/linkcheck/ftests/data/base3.html.result index 7ac52ed9..66221ce3 100644 --- a/linkcheck/ftests/data/base3.html.result +++ b/linkcheck/ftests/data/base3.html.result @@ -1,9 +1,9 @@ -url file://%(curdir)s/linkcheck/ftests/data/base3.html +url 'file://%(curdir)s/linkcheck/ftests/data/base3.html' cache key file://%(curdir)s/linkcheck/ftests/data/base3.html real url file://%(curdir)s/linkcheck/ftests/data/base3.html valid -url test.txt +url 'test.txt' cache key file://%(curdir)s/linkcheck/ftests/data/base/test.txt real url file://%(curdir)s/linkcheck/ftests/data/base/test.txt baseurl file://%(curdir)s/linkcheck/ftests/data/base/ diff --git a/linkcheck/ftests/data/file.asc.result b/linkcheck/ftests/data/file.asc.result index 043d1f72..40e800c4 100644 --- a/linkcheck/ftests/data/file.asc.result +++ b/linkcheck/ftests/data/file.asc.result @@ -1,4 +1,4 @@ -url file://%(curdir)s/linkcheck/ftests/data/file.asc +url 'file://%(curdir)s/linkcheck/ftests/data/file.asc' cache key file://%(curdir)s/linkcheck/ftests/data/file.asc real url file://%(curdir)s/linkcheck/ftests/data/file.asc valid diff --git a/linkcheck/ftests/data/file.css.result b/linkcheck/ftests/data/file.css.result index fb858261..b2492e4f 100644 --- a/linkcheck/ftests/data/file.css.result +++ b/linkcheck/ftests/data/file.css.result @@ -1,14 +1,14 @@ -url file://%(curdir)s/linkcheck/ftests/data/file.css +url 'file://%(curdir)s/linkcheck/ftests/data/file.css' cache key file://%(curdir)s/linkcheck/ftests/data/file.css real url file://%(curdir)s/linkcheck/ftests/data/file.css valid -url file.html +url 'file.html' cache key file://%(curdir)s/linkcheck/ftests/data/file.html real url file://%(curdir)s/linkcheck/ftests/data/file.html valid -url file.html (cached) +url 'file.html' (cached) cache key file://%(curdir)s/linkcheck/ftests/data/file.html real url file://%(curdir)s/linkcheck/ftests/data/file.html valid diff --git a/linkcheck/ftests/data/file.html.result b/linkcheck/ftests/data/file.html.result index 8e179f48..2f9452ef 100644 --- a/linkcheck/ftests/data/file.html.result +++ b/linkcheck/ftests/data/file.html.result @@ -1,41 +1,41 @@ -url file://%(curdir)s/linkcheck/ftests/data/file.html +url 'file://%(curdir)s/linkcheck/ftests/data/file.html' cache key file://%(curdir)s/linkcheck/ftests/data/file.html real url file://%(curdir)s/linkcheck/ftests/data/file.html valid -url file.html (cached) +url 'file.html' (cached) cache key file://%(curdir)s/linkcheck/ftests/data/file.html real url file://%(curdir)s/linkcheck/ftests/data/file.html name relative url valid -url file.html#isnix +url 'file.html#isnix' cache key file://%(curdir)s/linkcheck/ftests/data/file.html#isnix real url file://%(curdir)s/linkcheck/ftests/data/file.html name bad anchor warning anchor #isnix not found valid -url file.html#iswas +url 'file.html#iswas' cache key file://%(curdir)s/linkcheck/ftests/data/file.html#iswas real url file://%(curdir)s/linkcheck/ftests/data/file.html name good anchor valid -url #isnix (cached) +url '#isnix' (cached) cache key file://%(curdir)s/linkcheck/ftests/data/file.html#isnix real url file://%(curdir)s/linkcheck/ftests/data/file.html name bad anchor warning anchor #isnix not found valid -url #iswas (cached) +url '#iswas' (cached) cache key file://%(curdir)s/linkcheck/ftests/data/file.html#iswas real url file://%(curdir)s/linkcheck/ftests/data/file.html name good anchor valid -url javascript:loadthis() +url 'javascript:loadthis()' cache key javascript:loadthis() real url javascript:loadthis() name javascript url diff --git a/linkcheck/ftests/data/file.txt.result b/linkcheck/ftests/data/file.txt.result index d4a363bb..55280d0f 100644 --- a/linkcheck/ftests/data/file.txt.result +++ b/linkcheck/ftests/data/file.txt.result @@ -1,4 +1,4 @@ -url file://%(curdir)s/linkcheck/ftests/data/file.txt +url 'file://%(curdir)s/linkcheck/ftests/data/file.txt' cache key file://%(curdir)s/linkcheck/ftests/data/file.txt real url file://%(curdir)s/linkcheck/ftests/data/file.txt valid diff --git a/linkcheck/ftests/data/frames.html.result b/linkcheck/ftests/data/frames.html.result index 4ab739ac..60165b9c 100644 --- a/linkcheck/ftests/data/frames.html.result +++ b/linkcheck/ftests/data/frames.html.result @@ -1,14 +1,14 @@ -url file://%(curdir)s/linkcheck/ftests/data/frames.html +url 'file://%(curdir)s/linkcheck/ftests/data/frames.html' cache key file://%(curdir)s/linkcheck/ftests/data/frames.html real url file://%(curdir)s/linkcheck/ftests/data/frames.html valid -url frames.html (cached) +url 'frames.html' (cached) cache key file://%(curdir)s/linkcheck/ftests/data/frames.html real url file://%(curdir)s/linkcheck/ftests/data/frames.html valid -url frames.html (cached) +url 'frames.html' (cached) cache key file://%(curdir)s/linkcheck/ftests/data/frames.html real url file://%(curdir)s/linkcheck/ftests/data/frames.html valid diff --git a/linkcheck/ftests/data/http.html.result b/linkcheck/ftests/data/http.html.result index 62b25f63..d46f65c0 100644 --- a/linkcheck/ftests/data/http.html.result +++ b/linkcheck/ftests/data/http.html.result @@ -1,35 +1,35 @@ -url http://localhost:8001/linkcheck/ftests/data/http.html +url 'http://localhost:8001/linkcheck/ftests/data/http.html' cache key http://localhost:8001/linkcheck/ftests/data/http.html real url http://localhost:8001/linkcheck/ftests/data/http.html valid -url http://www.garantiertnixgutt.bla/ +url 'http://www.garantiertnixgutt.bla/' cache key http://www.garantiertnixgutt.bla/ real url http://www.garantiertnixgutt.bla/ name bad url error -url http://localhost:8000/ +url 'http://localhost:8000/' cache key http://localhost:8000/ real url http://localhost:8000/ name ok error -url http:/localhost:8000/ +url 'http:/localhost:8000/' cache key http:///localhost%%3A8000/ real url http:///localhost%%3A8000/ name one slash warning Base URL is not properly normed. Normed url is 'http:///localhost%%3A8000/'. error -url http:localhost:8000/ (cached) +url 'http:localhost:8000/' (cached) cache key http:///localhost%%3A8000/ real url http:///localhost%%3A8000/ name no slash warning Base URL is not properly normed. Normed url is 'http:///localhost%%3A8000/'. error -url http:// +url 'http://' cache key http:/// real url http:/// name no url diff --git a/linkcheck/ftests/test_error.py b/linkcheck/ftests/test_error.py index 5b08b27b..9f6fc261 100644 --- a/linkcheck/ftests/test_error.py +++ b/linkcheck/ftests/test_error.py @@ -30,7 +30,7 @@ class TestError (linkcheck.ftests.StandardTest): url = "hutzli:" nurl = linkcheck.url.url_norm(url) resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % nurl, "real url %s" % nurl, "error", @@ -42,7 +42,7 @@ class TestError (linkcheck.ftests.StandardTest): url = " http://www.heise.de/" nurl = linkcheck.url.url_norm(url) resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % nurl, "real url %s" % nurl, "error", @@ -51,7 +51,7 @@ class TestError (linkcheck.ftests.StandardTest): url = "\nhttp://www.heise.de/" nurl = linkcheck.url.url_norm(url) resultlines = [ - "url %s" % nurl, + "url %r" % nurl, "cache key %s" % nurl, "real url %s" % nurl, "error", @@ -63,7 +63,7 @@ class TestError (linkcheck.ftests.StandardTest): url = "http://www.heise.de/ " nurl = linkcheck.url.url_norm(url) resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % nurl, "real url %s" % nurl, "warning Base URL is not properly normed. Normed url is %r." % nurl, @@ -73,7 +73,7 @@ class TestError (linkcheck.ftests.StandardTest): url = "http://www.heise.de/\n" nurl = linkcheck.url.url_norm(url) resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % nurl, "real url %s" % nurl, "warning Base URL is not properly normed. Normed url is %r." % nurl, @@ -87,7 +87,7 @@ class TestError (linkcheck.ftests.StandardTest): url = "äöü?:" nurl = linkcheck.url.url_norm(url) resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % nurl, "real url %s" % nurl, "error", @@ -97,7 +97,7 @@ class TestError (linkcheck.ftests.StandardTest): url = "?äöü?" nurl = linkcheck.url.url_norm(url) resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % nurl, "real url %s" % nurl, "error", @@ -107,7 +107,7 @@ class TestError (linkcheck.ftests.StandardTest): url = "@³²¼][½ ³@] ¬½" nurl = linkcheck.url.url_norm(url) resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % nurl, "real url %s" % nurl, "error", diff --git a/linkcheck/ftests/test_file.py b/linkcheck/ftests/test_file.py index 4280125c..b5bfe503 100644 --- a/linkcheck/ftests/test_file.py +++ b/linkcheck/ftests/test_file.py @@ -49,7 +49,7 @@ class TestFile (linkcheck.ftests.StandardTest): # good file url = "file://%(curdir)s/%(datadir)s/file.txt" % attrs resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "valid", @@ -58,7 +58,7 @@ class TestFile (linkcheck.ftests.StandardTest): # bad file url = "file:/%(curdir)s/%(datadir)s/file.txt" % attrs resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "error", @@ -68,7 +68,7 @@ class TestFile (linkcheck.ftests.StandardTest): url = "file:%(curdir)s/%(datadir)s/file.txt" % attrs nurl = linkcheck.url.url_norm(url) resultlines = [ - "url %s" % url, + "url %r" % url, "cache key file://%(curdir)s/%(datadir)s/file.txt" % attrs, "real url file://%(curdir)s/%(datadir)s/file.txt" % attrs, "warning Base URL is not properly normed. Normed url is %r." % nurl, @@ -78,7 +78,7 @@ class TestFile (linkcheck.ftests.StandardTest): # good dir url = "file://%(curdir)s/%(datadir)s/" % attrs resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "valid", diff --git a/linkcheck/ftests/test_ftp.py b/linkcheck/ftests/test_ftp.py index e414ab71..87d2f9ed 100644 --- a/linkcheck/ftests/test_ftp.py +++ b/linkcheck/ftests/test_ftp.py @@ -31,7 +31,7 @@ class TestFtp (linkcheck.ftests.StandardTest): # ftp two slashes url = "ftp://ftp.debian.org/" resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "valid", @@ -44,7 +44,7 @@ class TestFtp (linkcheck.ftests.StandardTest): url = "ftp:/ftp.debian.org/" nurl = linkcheck.url.url_norm(url) resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % nurl, "real url %s" % nurl, "warning Base URL is not properly normed. Normed url is %r." % nurl, @@ -55,7 +55,7 @@ class TestFtp (linkcheck.ftests.StandardTest): url = "ftp://ftp.debian.org" nurl = linkcheck.url.url_norm(url) resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % nurl, "real url %s" % nurl, "warning Base URL is not properly normed. Normed url is %r." % nurl, @@ -66,7 +66,7 @@ class TestFtp (linkcheck.ftests.StandardTest): url = "ftp://ftp.debian.org/debian" nurl = linkcheck.url.url_norm(url) resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % nurl, "real url %s" % nurl, "warning Missing trailing directory slash in ftp url", @@ -80,7 +80,7 @@ class TestFtp (linkcheck.ftests.StandardTest): url = "ftp://ftp.debian.org//debian/" nurl = linkcheck.url.url_norm(url) resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % nurl, "real url %s" % nurl, "warning Base URL is not properly normed. Normed url is %r." % nurl, @@ -91,7 +91,7 @@ class TestFtp (linkcheck.ftests.StandardTest): url = "ftp://ftp.debian.org////////debian/" nurl = linkcheck.url.url_norm(url) resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % nurl, "real url %s" % nurl, "warning Base URL is not properly normed. Normed url is %r." % nurl, @@ -101,7 +101,7 @@ class TestFtp (linkcheck.ftests.StandardTest): # ftp three slashes url = "ftp:///ftp.debian.org/" resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "error", diff --git a/linkcheck/ftests/test_https.py b/linkcheck/ftests/test_https.py index 5b671b20..3cf24f83 100644 --- a/linkcheck/ftests/test_https.py +++ b/linkcheck/ftests/test_https.py @@ -29,7 +29,7 @@ class TestHttps (linkcheck.ftests.StandardTest): """test some https links""" url = "https://sourceforge.net/" resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "valid", diff --git a/linkcheck/ftests/test_mail.py b/linkcheck/ftests/test_mail.py index fb3331aa..22329c8d 100644 --- a/linkcheck/ftests/test_mail.py +++ b/linkcheck/ftests/test_mail.py @@ -30,7 +30,7 @@ class TestMail (linkcheck.ftests.StandardTest): url = self.quote("mailto:Dude , "\ "Killer ?subject=bla") resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "info Verified address: is deliverable", @@ -40,7 +40,7 @@ class TestMail (linkcheck.ftests.StandardTest): url = self.quote("mailto:Bastian Kleineidam ?"\ "bcc=calvin%40users.sf.net") resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "info Verified address: is deliverable", @@ -49,7 +49,7 @@ class TestMail (linkcheck.ftests.StandardTest): self.direct(url, resultlines) url = self.quote("mailto:Bastian Kleineidam ") resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "info Verified address: is deliverable", @@ -58,7 +58,7 @@ class TestMail (linkcheck.ftests.StandardTest): self.direct(url, resultlines) url = self.quote("mailto:o'hara@users.sf.net") resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "info Verified address: is deliverable", @@ -68,7 +68,7 @@ class TestMail (linkcheck.ftests.StandardTest): url = self.quote("mailto:?to=calvin@users.sf.net&subject=blubb&"\ "cc=calvin_cc@users.sf.net&CC=calvin_CC@users.sf.net") resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "info Verified address: is deliverable", @@ -81,7 +81,7 @@ class TestMail (linkcheck.ftests.StandardTest): "Re:%20[fm%20#11093]%20(news-admins)%20Submission%20"\ "report%20-%20Pretty%20CoLoRs") resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "valid", @@ -89,7 +89,7 @@ class TestMail (linkcheck.ftests.StandardTest): self.direct(url, resultlines) url = self.quote("mailto:"+"foo@foo-bar.de?subject=test") resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "valid", @@ -102,7 +102,7 @@ class TestMail (linkcheck.ftests.StandardTest): url = "mailto:calvin@users.sf.net?subject=äöü" qurl = self.quote(url) resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % qurl, "real url %s" % qurl, "info Verified address: is deliverable", @@ -113,7 +113,7 @@ class TestMail (linkcheck.ftests.StandardTest): url = "mailto:calvin@users.sf.net?subject=Halli hallo" qurl = self.quote(url) resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % qurl, "real url %s" % qurl, "info Verified address: is deliverable", @@ -123,7 +123,7 @@ class TestMail (linkcheck.ftests.StandardTest): self.direct(url, resultlines) url = self.quote("mailto:") resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "warning No addresses found", @@ -137,7 +137,7 @@ class TestMail (linkcheck.ftests.StandardTest): url = self.quote("mailto:Bastian Kleineidam "\ "") resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "error", diff --git a/linkcheck/ftests/test_news.py b/linkcheck/ftests/test_news.py index bc012916..90cd6c40 100644 --- a/linkcheck/ftests/test_news.py +++ b/linkcheck/ftests/test_news.py @@ -36,7 +36,7 @@ class TestNews (linkcheck.ftests.StandardTest): # news testing url = "news:comp.os.linux.misc" resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "warning No NNTP server specified, skipping this URL", @@ -46,7 +46,7 @@ class TestNews (linkcheck.ftests.StandardTest): # no group url = "news:" resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "warning No NNTP server specified, skipping this URL", @@ -59,7 +59,7 @@ class TestNews (linkcheck.ftests.StandardTest): url = "snews:de.comp.os.unix.linux.misc" nurl = linkcheck.url.url_norm(url) resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % nurl, "real url %s" % nurl, "warning Base URL is not properly normed. Normed url is %r." % nurl, @@ -73,7 +73,7 @@ class TestNews (linkcheck.ftests.StandardTest): url = "news:§$%&/´`(§%" qurl = self.quote(url) resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % qurl, "real url %s" % qurl, "warning Base URL is not properly normed. Normed url is %r." % qurl, @@ -86,7 +86,7 @@ class TestNews (linkcheck.ftests.StandardTest): """nttp scheme with host""" url = "nntp://news.yaako.com/comp.lang.python" resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "valid", @@ -97,7 +97,7 @@ class TestNews (linkcheck.ftests.StandardTest): """article span""" url = "nntp://news.yaako.com/comp.lang.python/1-5" resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "valid", @@ -105,7 +105,7 @@ class TestNews (linkcheck.ftests.StandardTest): self.newstest(url, resultlines) url = "news:comp.lang.python/1-5" resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "warning No NNTP server specified, skipping this URL", @@ -117,7 +117,7 @@ class TestNews (linkcheck.ftests.StandardTest): """host but no group""" url = "nntp://news.yaako.com/" resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "warning No newsgroup specified in NNTP URL", diff --git a/linkcheck/ftests/test_telnet.py b/linkcheck/ftests/test_telnet.py index d5df2740..6a235f4e 100644 --- a/linkcheck/ftests/test_telnet.py +++ b/linkcheck/ftests/test_telnet.py @@ -28,7 +28,7 @@ class TestTelnet (linkcheck.ftests.StandardTest): url = "telnet:" nurl = linkcheck.url.url_norm(url) resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % nurl, "real url %s" % nurl, "warning Base URL is not properly normed. Normed url is %r." % nurl, @@ -37,7 +37,7 @@ class TestTelnet (linkcheck.ftests.StandardTest): self.direct(url, resultlines) url = "telnet://www.imadoofus.com" resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "error", @@ -45,7 +45,7 @@ class TestTelnet (linkcheck.ftests.StandardTest): self.direct(url, resultlines) url = "telnet://user@www.imadoofus.com" resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "error", @@ -53,7 +53,7 @@ class TestTelnet (linkcheck.ftests.StandardTest): self.direct(url, resultlines) url = "telnet://user:pass@www.imadoofus.com" resultlines = [ - "url %s" % url, + "url %r" % url, "cache key %s" % url, "real url %s" % url, "error",