diff --git a/.cvsignore b/.cvsignore index df16e722..eacf2f50 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ +configure-stamp build-stamp .files-stamp *-out.* diff --git a/Makefile b/Makefile index 9ccd6e62..6bb8e1f6 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,8 @@ LCOPTS=-ocolored -Ftext -Fhtml -Fgml -Fsql -Fcsv -Fxml -R -t0 -v -s DEBPACKAGE = $(PACKAGE)_$(VERSION)_all.deb $(PACKAGE)-ssl_$(VERSION)_i386.deb PULLHOST=phoenix.net.uni-sb.de PULLPATH=/home/calvin/temp/linkchecker +OFFLINETESTS = test_base test_misc test_file test_frames +ONLINETESTS = test_mail test_http test_https test_news test_ftp DESTDIR=/. .PHONY: test clean distclean package files upload dist locale all @@ -69,7 +71,10 @@ uploadpull: distclean dist package files VERSION ssh -C -t shell1.sourceforge.net "cd /home/groups/$(PACKAGE) && make pull" test: - python2 test/regrtest.py + python2 test/regrtest.py $(OFFLINE_TESTS) + +onlinetest: + python2 test/regrtest.py $(ONLINE_TESTS) locale: $(MAKE) -C po diff --git a/debian/changelog b/debian/changelog index 1af121e3..a3919b1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,12 +4,12 @@ linkchecker (1.3.0) unstable; urgency=low * fix agent matching in robotparser2.py * added more LinkPatterns (ripped from HTML::Tagset.pm) * fix ignored configfile settings for loggers - * optional filename argument for -F (patch from + * optional filename argument for -F (patch from Jamie Heilman ) - * config file option to control which fields the loggers should print - out + * config file option to control which fields the loggers should print + * fix anchor bug (unpack tuple of wrong size) - -- Bastian Kleineidam Fri, 9 Feb 2001 10:51:24 +0100 + -- Bastian Kleineidam Thu, 22 Feb 2001 01:35:50 +0100 linkchecker (1.2.14) unstable; urgency=low diff --git a/debian/control b/debian/control index d672b8e9..a9520c6b 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,13 @@ Source: linkchecker Section: web Priority: optional Maintainer: Bastian Kleineidam -Build-Depends: python2-base (>= 2.0), python2-dev (>= 2.0), debhelper (>= 3.0.0), libssl096-dev +Build-Depends: python2-base, python2-dev, debhelper (>= 3.0.0), libssl096-dev Build-Depends-Indep: gettext -Standards-Version: 3.5.1 +Standards-Version: 3.5.2 Package: linkchecker Architecture: all -Depends: python2-base (>= 2.0) +Depends: python2-base Suggests: linkchecker-ssl Description: check HTML documents for broken links Features: diff --git a/linkcheck/UrlData.py b/linkcheck/UrlData.py index 91316be6..d491f1c1 100644 --- a/linkcheck/UrlData.py +++ b/linkcheck/UrlData.py @@ -297,7 +297,7 @@ class UrlData: if not (anchor!="" and self.isHtml() and self.valid): return self.getContent() - for cur_anchor,line in self.searchInForTag(AnchorPattern): + for cur_anchor,line,name in self.searchInForTag(AnchorPattern): if cur_anchor == anchor: return self.setWarning("anchor #"+anchor+" not found") diff --git a/test/test_file.py b/test/test_file.py index c6885db8..0ff66e60 100644 --- a/test/test_file.py +++ b/test/test_file.py @@ -8,7 +8,7 @@ config["anchors"] = 1 config["verbose"] = 1 config.disableThreading() htmldir = "test/html" -for file in ('file.html'): +for file in ('file.html',): url = os.path.join(htmldir, file) config.appendUrl(linkcheck.UrlData.GetUrlDataFrom(url, 0)) linkcheck.checkUrls(config) diff --git a/test/test_frames.py b/test/test_frames.py index fddc2f12..4b3457aa 100644 --- a/test/test_frames.py +++ b/test/test_frames.py @@ -8,7 +8,7 @@ config["anchors"] = 1 config["verbose"] = 1 config.disableThreading() htmldir = "test/html" -for file in ('frames.html'): +for file in ('frames.html',): url = os.path.join(htmldir, file) config.appendUrl(linkcheck.UrlData.GetUrlDataFrom(url, 0)) linkcheck.checkUrls(config) diff --git a/test/test_ftp.py b/test/test_ftp.py index 2bbfbcc7..27a701d8 100644 --- a/test/test_ftp.py +++ b/test/test_ftp.py @@ -8,7 +8,7 @@ config["anchors"] = 1 config["verbose"] = 1 config.disableThreading() htmldir = "test/html" -for file in ('ftp.html'): +for file in ('ftp.html',): url = os.path.join(htmldir, file) config.appendUrl(linkcheck.UrlData.GetUrlDataFrom(url, 0)) linkcheck.checkUrls(config) diff --git a/test/test_http.py b/test/test_http.py index 333dd671..33ee8ff1 100644 --- a/test/test_http.py +++ b/test/test_http.py @@ -8,7 +8,7 @@ config["anchors"] = 1 config["verbose"] = 1 config.disableThreading() htmldir = "test/html" -for file in ('http.html'): +for file in ('http.html',): url = os.path.join(htmldir, file) config.appendUrl(linkcheck.UrlData.GetUrlDataFrom(url, 0)) linkcheck.checkUrls(config) diff --git a/test/test_https.py b/test/test_https.py index 1aa1a37f..aa8449fd 100644 --- a/test/test_https.py +++ b/test/test_https.py @@ -8,7 +8,7 @@ config["anchors"] = 1 config["verbose"] = 1 config.disableThreading() htmldir = "test/html" -for file in ('https.html'): +for file in ('https.html',): url = os.path.join(htmldir, file) config.appendUrl(linkcheck.UrlData.GetUrlDataFrom(url, 0)) linkcheck.checkUrls(config) diff --git a/test/test_mail.py b/test/test_mail.py index f66af4e0..e8d8445a 100644 --- a/test/test_mail.py +++ b/test/test_mail.py @@ -8,7 +8,7 @@ config["anchors"] = 1 config["verbose"] = 1 config.disableThreading() htmldir = "test/html" -for file in ('mail.html'): +for file in ('mail.html',): url = os.path.join(htmldir, file) config.appendUrl(linkcheck.UrlData.GetUrlDataFrom(url, 0)) linkcheck.checkUrls(config) diff --git a/test/test_misc.py b/test/test_misc.py index a88abf96..4b478ad4 100644 --- a/test/test_misc.py +++ b/test/test_misc.py @@ -8,7 +8,7 @@ config["anchors"] = 1 config["verbose"] = 1 config.disableThreading() htmldir = "test/html" -for file in ('misc.html'): +for file in ('misc.html',): url = os.path.join(htmldir, file) config.appendUrl(linkcheck.UrlData.GetUrlDataFrom(url, 0)) linkcheck.checkUrls(config) diff --git a/test/test_news.py b/test/test_news.py index f52cfafe..4aa1e5bf 100644 --- a/test/test_news.py +++ b/test/test_news.py @@ -8,7 +8,7 @@ config["anchors"] = 1 config["verbose"] = 1 config.disableThreading() htmldir = "test/html" -for file in ('news.html'): +for file in ('news.html',): url = os.path.join(htmldir, file) config.appendUrl(linkcheck.UrlData.GetUrlDataFrom(url, 0)) linkcheck.checkUrls(config)