diff --git a/doc/changelog.txt b/doc/changelog.txt index d8a35578..633959d3 100644 --- a/doc/changelog.txt +++ b/doc/changelog.txt @@ -5,6 +5,7 @@ Features: Changes: - checking: Always use the W3C validator to check HTML or CSS syntax. +- checking: Remove the http-wrong-redirect warning. - cmdline: Replace argument parsing. No changes in functionality, only the help text will be formatted different. diff --git a/doc/de.po b/doc/de.po index 88b777f8..dbf9e3be 100644 --- a/doc/de.po +++ b/doc/de.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: linkchecker 3.4\n" -"POT-Creation-Date: 2013-02-27 17:20+0100\n" -"PO-Revision-Date: 2013-01-06 18:11+0100\n" +"POT-Creation-Date: 2013-04-11 14:16+0300\n" +"PO-Revision-Date: 2013-04-11 18:32+0100\n" "Last-Translator: Bastian Kleineidam \n" "Language-Team: de \n" "Language: \n" @@ -367,14 +367,8 @@ msgstr "B<--check-css>" # type: Plain text #. type: Plain text #: en/linkchecker.1:85 en/linkcheckerrc.5:23 -#, fuzzy -#| msgid "" -#| "Check syntax of CSS URLs with cssutils. If it's not installed, check with " -#| "the W3C online validator." msgid "Check syntax of CSS URLs with the W3C online validator." -msgstr "" -"Prüfe Syntax von CSS URLs mit cssutils. Wenn es nicht installiert ist, prüfe " -"mit dem W3C Online Validator." +msgstr "Prüfe Syntax von CSS URLs mit dem W3C Online Validator." # type: TP #. type: TP @@ -386,14 +380,8 @@ msgstr "B<--check-html>" # type: Plain text #. type: Plain text #: en/linkchecker.1:88 en/linkcheckerrc.5:28 -#, fuzzy -#| msgid "" -#| "Check syntax of HTML URLs with HTML tidy. If it's not installed, check " -#| "with the W3C online validator." msgid "Check syntax of HTML URLs with the W3C online validator." -msgstr "" -"Prüfe Syntax von HTML URLs mit HTML tidy. Wenn es nicht installiert ist, " -"prüfe mit dem W3C Online Validator." +msgstr "Prüfe Syntax von HTML URLs mit dem W3C Online Validator." # type: TP #. type: TP @@ -1481,11 +1469,11 @@ msgstr " Ein nicht unterstützter Link wird nur eine Warnung ausgeben. Weitere #, no-wrap msgid "" " The complete list of recognized, but unsupported links can be found\n" -" in the B source file. The most prominent of them\n" -" should be JavaScript links.\n" +" in the B source file.\n" +" The most prominent of them should be JavaScript links.\n" msgstr "" " Die komplette Liste von erkannten, aber nicht unterstützten Links ist in der\n" -" Quelldatei B. Die bekanntesten davon dürften JavaScript-Links sein.\n" +" Quelldatei B. Die bekanntesten davon dürften JavaScript-Links sein.\n" # type: SH #. type: SH @@ -1529,25 +1517,19 @@ msgstr "3. Der URL-Inhalt muss ladbar sein. Dies ist normalerweise der Fall, mit #. type: Plain text #: en/linkchecker.1:432 -#, fuzzy, no-wrap -#| msgid "" -#| "4. The maximum recursion level must not be exceeded. It is configured\n" -#| " with the ``--recursion-level`` option and is unlimited per default.\n" +#, no-wrap msgid "" "4. The maximum recursion level must not be exceeded. It is configured\n" " with the B<--recursion-level> option and is unlimited per default.\n" -msgstr "4. Die maximale Rekursionstiefe darf nicht überschritten werden. Diese wird mit der Option ``--recursion-level`` konfiguriert und ist standardmäßig nicht limitiert.\n" +msgstr "4. Die maximale Rekursionstiefe darf nicht überschritten werden. Diese wird mit der Option B<--recursion-level> konfiguriert und ist standardmäßig nicht limitiert.\n" #. type: Plain text #: en/linkchecker.1:435 -#, fuzzy, no-wrap -#| msgid "" -#| "5. It must not match the ignored URL list. This is controlled with\n" -#| " the ``--ignore-url`` option.\n" +#, no-wrap msgid "" "5. It must not match the ignored URL list. This is controlled with\n" " the B<--ignore-url> option.\n" -msgstr "5. Die URL darf nicht in der Liste von ignorierten URLs sein. Die ignorierten URLs werden mit der Option ``--ignore-url`` konfiguriert.\n" +msgstr "5. Die URL darf nicht in der Liste von ignorierten URLs sein. Die ignorierten URLs werden mit der Option B<--ignore-url> konfiguriert.\n" #. type: Plain text #: en/linkchecker.1:439 @@ -1560,16 +1542,12 @@ msgstr "6. Das Robots Exclusion Protocol muss es erlauben, dass Verknüpfungen i #. type: Plain text #: en/linkchecker.1:442 -#, fuzzy -#| msgid "" -#| "Note that the directory recursion reads all files in that directory, not " -#| "just a subset like ``index.htm*``." msgid "" "Note that the directory recursion reads all files in that directory, not " "just a subset like B." msgstr "" "Beachten Sie, dass die Verzeichnisrekursion alle Dateien in diesem " -"Verzeichnis liest, nicht nur eine Untermenge wie bspw. ``index.html*``." +"Verzeichnis liest, nicht nur eine Untermenge wie bspw. B." # type: SH #. type: SH @@ -1785,53 +1763,42 @@ msgstr "" "B - Dokumentation zu regulären " "Ausdrücken" -#. type: Plain text -#: en/linkchecker.1:505 -msgid "" -"B - the unknown.py source " -"file" -msgstr "" -"B - die unknown.py " -"Quelldatei" - # type: SH #. type: SH -#: en/linkchecker.1:506 en/linkcheckerrc.5:606 en/linkchecker-gui.1:16 +#: en/linkchecker.1:504 en/linkcheckerrc.5:606 en/linkchecker-gui.1:16 #, no-wrap msgid "SEE ALSO" msgstr "SIEHE AUCH" # type: TH #. type: Plain text -#: en/linkchecker.1:508 +#: en/linkchecker.1:506 msgid "B(5)" msgstr "B(5)" # type: SH #. type: SH -#: en/linkchecker.1:509 en/linkcheckerrc.5:609 en/linkchecker-gui.1:19 +#: en/linkchecker.1:507 en/linkcheckerrc.5:609 en/linkchecker-gui.1:19 #, no-wrap msgid "AUTHOR" msgstr "AUTHOR" # type: Plain text #. type: Plain text -#: en/linkchecker.1:511 en/linkcheckerrc.5:611 en/linkchecker-gui.1:21 +#: en/linkchecker.1:509 en/linkcheckerrc.5:611 en/linkchecker-gui.1:21 msgid "Bastian Kleineidam Ebastian.kleineidam@web.deE" msgstr "Bastian Kleineidam Ebastian.kleineidam@web.deE" # type: SH #. type: SH -#: en/linkchecker.1:512 en/linkcheckerrc.5:612 en/linkchecker-gui.1:22 +#: en/linkchecker.1:510 en/linkcheckerrc.5:612 en/linkchecker-gui.1:22 #, no-wrap msgid "COPYRIGHT" msgstr "COPYRIGHT" # type: Plain text #. type: Plain text -#: en/linkchecker.1:513 en/linkcheckerrc.5:613 +#: en/linkchecker.1:511 en/linkcheckerrc.5:613 msgid "Copyright \\(co 2000-2013 Bastian Kleineidam" msgstr "Copyright \\(co 2000-2013 Bastian Kleineidam" @@ -2256,55 +2223,48 @@ msgstr "Standard ist alle URLs anzunehmen und zu prüfen." # type: TP #. type: TP #: en/linkcheckerrc.5:153 -#, fuzzy, no-wrap -#| msgid "BI" +#, no-wrap msgid "BI" -msgstr "BI" +msgstr "BI" #. type: Plain text #: en/linkcheckerrc.5:156 msgid "Maximum number of connections to HTTP servers." -msgstr "" +msgstr "Maximale Anzahl an HTTP-Verbindungen." #. type: Plain text #: en/linkcheckerrc.5:158 en/linkcheckerrc.5:165 -#, fuzzy -#| msgid "The default number of days is 14." msgid "The default is 10." -msgstr "The Standardanzahl an Tagen ist 14." +msgstr "Der Standard ist 10." # type: TP #. type: TP #: en/linkcheckerrc.5:160 -#, fuzzy, no-wrap -#| msgid "BI" +#, no-wrap msgid "BI" -msgstr "BI" +msgstr "BI" #. type: Plain text #: en/linkcheckerrc.5:163 msgid "Maximum number of connections to HTTPS servers." -msgstr "" +msgstr "Maximale Anzahl an HTTPS-Verbindungen." # type: TP #. type: TP #: en/linkcheckerrc.5:167 -#, fuzzy, no-wrap -#| msgid "BI" +#, no-wrap msgid "BI" -msgstr "BI" +msgstr "BI" #. type: Plain text #: en/linkcheckerrc.5:170 msgid "Maximum number of connections to FTP servers." -msgstr "" +msgstr "Maximale Anzahl an FTP-Verbindungen." #. type: Plain text #: en/linkcheckerrc.5:172 -#, fuzzy -#| msgid "The default number of days is 14." msgid "The default is 2." -msgstr "The Standardanzahl an Tagen ist 14." +msgstr "Der Standard ist 2." # type: SS #. type: SS @@ -3721,93 +3681,11 @@ msgstr "B(1)" msgid "Copyright \\(co 2009-2013 Bastian Kleineidam" msgstr "Copyright \\(co 2009-2013 Bastian Kleineidam" -# type: Plain text #~ msgid "" -#~ "Check syntax of CSS URLs with the cssutils library, falling back to the " -#~ "W3C online validator if cssutils is not available." +#~ "B - the " +#~ "unknown.py source file" #~ msgstr "" -#~ "Prüfe Syntax von CSS URLs mit cssutils. Wenn cssutils nicht installiert " -#~ "ist, prüfe mit dem W3C Online Validator." - -# type: Plain text -#~ msgid "" -#~ "Check syntax of HTML URLs with the HTML tidy library, falling back to the " -#~ "W3C online validator if HTML tidy is not available.." -#~ msgstr "" -#~ "Prüfe Syntax von HTML URLs mit HTML tidy. Wenn HTML tidy nicht " -#~ "installiert ist, prüfe mit dem W3C Online Validator." - -#~ msgid "" -#~ " - ``acap:`` (application configuration access protocol)\n" -#~ " - ``afs:`` (Andrew File System global file names)\n" -#~ " - ``chrome:`` (Mozilla specific)\n" -#~ " - ``cid:`` (content identifier)\n" -#~ " - ``clsid:`` (Microsoft specific)\n" -#~ " - ``data:`` (data)\n" -#~ " - ``dav:`` (dav)\n" -#~ " - ``fax:`` (fax)\n" -#~ " - ``feed:`` (News feeds)\n" -#~ " - ``find:`` (Mozilla specific)\n" -#~ " - ``gopher:`` (Gopher)\n" -#~ " - ``imap:`` (internet message access protocol)\n" -#~ " - ``isbn:`` (ISBN (int. book numbers))\n" -#~ " - ``javascript:`` (JavaScript)\n" -#~ " - ``ldap:`` (Lightweight Directory Access Protocol)\n" -#~ " - ``mailserver:`` (Access to data available from mail servers)\n" -#~ " - ``mid:`` (message identifier)\n" -#~ " - ``mms:`` (multimedia stream)\n" -#~ " - ``modem:`` (modem)\n" -#~ " - ``nfs:`` (network file system protocol)\n" -#~ " - ``opaquelocktoken:`` (opaquelocktoken)\n" -#~ " - ``pop:`` (Post Office Protocol v3)\n" -#~ " - ``prospero:`` (Prospero Directory Service)\n" -#~ " - ``rsync:`` (rsync protocol)\n" -#~ " - ``rtsp:`` (real time streaming protocol)\n" -#~ " - ``service:`` (service location)\n" -#~ " - ``shttp:`` (secure HTTP)\n" -#~ " - ``sip:`` (session initiation protocol)\n" -#~ " - ``steam:`` (Steam browser protocol)\n" -#~ " - ``tel:`` (telephone)\n" -#~ " - ``tip:`` (Transaction Internet Protocol)\n" -#~ " - ``tn3270:`` (Interactive 3270 emulation sessions)\n" -#~ " - ``vemmi:`` (versatile multimedia interface)\n" -#~ " - ``wais:`` (Wide Area Information Servers)\n" -#~ " - ``z39.50r:`` (Z39.50 Retrieval)\n" -#~ " - ``z39.50s:`` (Z39.50 Session)\n" -#~ msgstr "" -#~ " - ``acap:`` (application configuration access protocol)\n" -#~ " - ``afs:`` (Andrew File System global file names)\n" -#~ " - ``chrome:`` (Mozilla specific)\n" -#~ " - ``cid:`` (content identifier)\n" -#~ " - ``clsid:`` (Microsoft specific)\n" -#~ " - ``data:`` (data)\n" -#~ " - ``dav:`` (dav)\n" -#~ " - ``fax:`` (fax)\n" -#~ " - ``feed:`` (News feeds)\n" -#~ " - ``find:`` (Mozilla specific)\n" -#~ " - ``gopher:`` (Gopher)\n" -#~ " - ``imap:`` (internet message access protocol)\n" -#~ " - ``isbn:`` (ISBN (int. book numbers))\n" -#~ " - ``javascript:`` (JavaScript)\n" -#~ " - ``ldap:`` (Lightweight Directory Access Protocol)\n" -#~ " - ``mailserver:`` (Access to data available from mail servers)\n" -#~ " - ``mid:`` (message identifier)\n" -#~ " - ``mms:`` (multimedia stream)\n" -#~ " - ``modem:`` (modem)\n" -#~ " - ``nfs:`` (network file system protocol)\n" -#~ " - ``opaquelocktoken:`` (opaquelocktoken)\n" -#~ " - ``pop:`` (Post Office Protocol v3)\n" -#~ " - ``prospero:`` (Prospero Directory Service)\n" -#~ " - ``rsync:`` (rsync protocol)\n" -#~ " - ``rtsp:`` (real time streaming protocol)\n" -#~ " - ``service:`` (service location)\n" -#~ " - ``shttp:`` (secure HTTP)\n" -#~ " - ``sip:`` (session initiation protocol)\n" -#~ " - ``steam:`` (Steam browser protocol)\n" -#~ " - ``tel:`` (telephone)\n" -#~ " - ``tip:`` (Transaction Internet Protocol)\n" -#~ " - ``tn3270:`` (Interactive 3270 emulation sessions)\n" -#~ " - ``vemmi:`` (versatile multimedia interface)\n" -#~ " - ``wais:`` (Wide Area Information Servers)\n" -#~ " - ``z39.50r:`` (Z39.50 Retrieval)\n" -#~ " - ``z39.50s:`` (Z39.50 Session)\n" +#~ "B - die " +#~ "unknown.py Quelldatei" diff --git a/doc/de/linkchecker.1 b/doc/de/linkchecker.1 index 00c0ac1d..544750db 100644 --- a/doc/de/linkchecker.1 +++ b/doc/de/linkchecker.1 @@ -92,10 +92,10 @@ Gebe die Version aus und beende das Programm. .SS Ausgabeoptionen .TP \fB\-\-check\-css\fP -Check syntax of CSS URLs with the W3C online validator. +Prüfe Syntax von CSS URLs mit dem W3C Online Validator. .TP \fB\-\-check\-html\fP -Check syntax of HTML URLs with the W3C online validator. +Prüfe Syntax von HTML URLs mit dem W3C Online Validator. .TP \fB\-\-complete\fP Gebe alle geprüften URLs aus. Standard ist es, doppelte URLs nur einmal @@ -416,7 +416,7 @@ Nicht unterstützte Links (\*(lqjavascript:\*(lq, etc.) Ein nicht unterstützter Link wird nur eine Warnung ausgeben. Weitere Prüfungen werden nicht durchgeführt. Die komplette Liste von erkannten, aber nicht unterstützten Links ist in der - Quelldatei \fBunknownurl.py\fP. Die bekanntesten davon dürften JavaScript\-Links sein. + Quelldatei \fBlinkcheck/checker/unknownurl.py\fP. Die bekanntesten davon dürften JavaScript\-Links sein. .SH Rekursion Bevor eine URL rekursiv geprüft wird, hat diese mehrere Bedingungen zu @@ -428,16 +428,14 @@ erfüllen. Diese werden in folgender Reihenfolge geprüft: 3. Der URL\-Inhalt muss ladbar sein. Dies ist normalerweise der Fall, mit Ausnahme von mailto: oder unbekannten URL\-Typen. -4. The maximum recursion level must not be exceeded. It is configured - with the \fB\-\-recursion\-level\fP option and is unlimited per default. +4. Die maximale Rekursionstiefe darf nicht überschritten werden. Diese wird mit der Option \fB\-\-recursion\-level\fP konfiguriert und ist standardmäßig nicht limitiert. -5. It must not match the ignored URL list. This is controlled with - the \fB\-\-ignore\-url\fP option. +5. Die URL darf nicht in der Liste von ignorierten URLs sein. Die ignorierten URLs werden mit der Option \fB\-\-ignore\-url\fP konfiguriert. 6. Das Robots Exclusion Protocol muss es erlauben, dass Verknüpfungen in der URL rekursiv verfolgt werden können. Dies wird geprüft, indem in den HTML Kopfdaten nach der "nofollow"\-Direktive gesucht wird. -Note that the directory recursion reads all files in that directory, not -just a subset like \fBindex.htm*\fP. +Beachten Sie, dass die Verzeichnisrekursion alle Dateien in diesem +Verzeichnis liest, nicht nur eine Untermenge wie bspw. \fBindex.html*\fP. .SH BEMERKUNGEN URLs von der Kommandozeile die mit \fBftp.\fP beginnen werden wie \fBftp://ftp.\fP @@ -504,9 +502,6 @@ Ausgabe Enkodierungen .br \fBhttp://docs.python.org/howto/regex.html\fP \- Dokumentation zu regulären Ausdrücken -.br -\fBhttp://linkchecker.git.sf.net/\:git/gitweb.cgi?p=linkchecker/linkchecker;\:a=blob;f=linkcheck/checker/unknownurl.py;hb=HEAD\fP -\- die unknown.py Quelldatei .SH "SIEHE AUCH" \fBlinkcheckerrc\fP(5) diff --git a/doc/de/linkcheckerrc.5 b/doc/de/linkcheckerrc.5 index f120d74a..67f77020 100644 --- a/doc/de/linkcheckerrc.5 +++ b/doc/de/linkcheckerrc.5 @@ -24,12 +24,12 @@ Option aktiviert die Ausgabe der Warnung \fBurl\-anchor\-not\-found\fP. Kommandozeilenoption: \fB\-\-anchors\fP .TP \fBcheckcss=\fP[\fB0\fP|\fB1\fP] -Check syntax of CSS URLs with the W3C online validator. +Prüfe Syntax von CSS URLs mit dem W3C Online Validator. .br Kommandozeilenoption: \fB\-\-check\-css\fP .TP \fBcheckhtml=\fP[\fB0\fP|\fB1\fP] -Check syntax of HTML URLs with the W3C online validator. +Prüfe Syntax von HTML URLs mit dem W3C Online Validator. .br Kommandozeilenoption: \fB\-\-check\-html\fP .TP @@ -160,23 +160,23 @@ Standard ist alle URLs anzunehmen und zu prüfen. Kommandozeilenoption: keine .TP \fBmaxconnectionshttp=\fP\fINUMBER\fP -Maximum number of connections to HTTP servers. +Maximale Anzahl an HTTP\-Verbindungen. .br -The default is 10. +Der Standard ist 10. .br Kommandozeilenoption: keine .TP \fBmaxconnectionshttps=\fP\fINUMBER\fP -Maximum number of connections to HTTPS servers. +Maximale Anzahl an HTTPS\-Verbindungen. .br -The default is 10. +Der Standard ist 10. .br Kommandozeilenoption: keine .TP \fBmaxconnectionsftp=\fP\fINUMBER\fP -Maximum number of connections to FTP servers. +Maximale Anzahl an FTP\-Verbindungen. .br -The default is 2. +Der Standard ist 2. .br Kommandozeilenoption: keine .SS [filtering] diff --git a/doc/en/linkchecker.1 b/doc/en/linkchecker.1 index 7f14e7d9..ada31447 100644 --- a/doc/en/linkchecker.1 +++ b/doc/en/linkchecker.1 @@ -409,8 +409,8 @@ Unsupported links (``javascript:``, etc.) will be made. The complete list of recognized, but unsupported links can be found - in the \fBunknownurl.py\fP source file. The most prominent of them - should be JavaScript links. + in the \fBlinkcheck/checker/unknownurl.py\fP source file. + The most prominent of them should be JavaScript links. .SH RECURSION Before descending recursively into a URL, it has to fulfill several @@ -500,8 +500,6 @@ might slow down the program or even the whole system. \fBhttp://docs.python.org/library/codecs.html#standard-encodings\fP - valid output encodings .br \fBhttp://docs.python.org/howto/regex.html\fP - regular expression documentation -.br -\fBhttp://linkchecker.git.sf.net/\:git/gitweb.cgi?p=linkchecker/linkchecker;\:a=blob;f=linkcheck/checker/unknownurl.py;hb=HEAD\fP - the unknown.py source file .SH "SEE ALSO" \fBlinkcheckerrc\fP(5) diff --git a/doc/linkchecker.doc.pot b/doc/linkchecker.doc.pot index a4c741d1..eefdba05 100644 --- a/doc/linkchecker.doc.pot +++ b/doc/linkchecker.doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2013-02-27 17:20+0100\n" +"POT-Creation-Date: 2013-04-11 14:16+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1152,8 +1152,8 @@ msgstr "" #, no-wrap msgid "" " The complete list of recognized, but unsupported links can be found\n" -" in the B source file. The most prominent of them\n" -" should be JavaScript links.\n" +" in the B source file.\n" +" The most prominent of them should be JavaScript links.\n" msgstr "" #. type: SH @@ -1390,43 +1390,36 @@ msgid "" "documentation" msgstr "" -#. type: Plain text -#: en/linkchecker.1:505 -msgid "" -"B " -"- the unknown.py source file" -msgstr "" - #. type: SH -#: en/linkchecker.1:506 en/linkcheckerrc.5:606 en/linkchecker-gui.1:16 +#: en/linkchecker.1:504 en/linkcheckerrc.5:606 en/linkchecker-gui.1:16 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: en/linkchecker.1:508 +#: en/linkchecker.1:506 msgid "B(5)" msgstr "" #. type: SH -#: en/linkchecker.1:509 en/linkcheckerrc.5:609 en/linkchecker-gui.1:19 +#: en/linkchecker.1:507 en/linkcheckerrc.5:609 en/linkchecker-gui.1:19 #, no-wrap msgid "AUTHOR" msgstr "" #. type: Plain text -#: en/linkchecker.1:511 en/linkcheckerrc.5:611 en/linkchecker-gui.1:21 +#: en/linkchecker.1:509 en/linkcheckerrc.5:611 en/linkchecker-gui.1:21 msgid "Bastian Kleineidam Ebastian.kleineidam@web.deE" msgstr "" #. type: SH -#: en/linkchecker.1:512 en/linkcheckerrc.5:612 en/linkchecker-gui.1:22 +#: en/linkchecker.1:510 en/linkcheckerrc.5:612 en/linkchecker-gui.1:22 #, no-wrap msgid "COPYRIGHT" msgstr "" #. type: Plain text -#: en/linkchecker.1:513 en/linkcheckerrc.5:613 +#: en/linkchecker.1:511 en/linkcheckerrc.5:613 msgid "Copyright \\(co 2000-2013 Bastian Kleineidam" msgstr "" diff --git a/linkcheck/checker/const.py b/linkcheck/checker/const.py index aa758d4f..d95ff94b 100644 --- a/linkcheck/checker/const.py +++ b/linkcheck/checker/const.py @@ -94,7 +94,6 @@ WARN_FILE_SYSTEM_PATH = "file-system-path" WARN_FTP_MISSING_SLASH = "ftp-missing-slash" WARN_HTTP_ROBOTS_DENIED = "http-robots-denied" WARN_HTTP_MOVED_PERMANENT = "http-moved-permanent" -WARN_HTTP_WRONG_REDIRECT = "http-wrong-redirect" WARN_HTTP_EMPTY_CONTENT = "http-empty-content" WARN_HTTP_COOKIE_STORE_ERROR = "http-cookie-store-error" WARN_HTTP_DECOMPRESS_ERROR = "http-decompress-error" @@ -132,8 +131,6 @@ Warnings = { WARN_FTP_MISSING_SLASH: _("The ftp: URL is missing a trailing slash."), WARN_HTTP_ROBOTS_DENIED: _("The http: URL checking has been denied."), WARN_HTTP_MOVED_PERMANENT: _("The URL has moved permanently."), - WARN_HTTP_WRONG_REDIRECT: - _("The URL has been redirected to an URL of a different type."), WARN_HTTP_EMPTY_CONTENT: _("The URL had no content."), WARN_HTTP_COOKIE_STORE_ERROR: _("An error occurred while storing a cookie."), diff --git a/linkcheck/checker/httpurl.py b/linkcheck/checker/httpurl.py index fc3e76e2..3fcec9b1 100644 --- a/linkcheck/checker/httpurl.py +++ b/linkcheck/checker/httpurl.py @@ -34,7 +34,7 @@ from . import (internpaturl, proxysupport, httpheaders as headers, urlbase, get_url_from, pooledconnection) # import warnings from .const import WARN_HTTP_ROBOTS_DENIED, \ - WARN_HTTP_WRONG_REDIRECT, WARN_HTTP_MOVED_PERMANENT, \ + WARN_HTTP_MOVED_PERMANENT, \ WARN_HTTP_EMPTY_CONTENT, WARN_HTTP_COOKIE_STORE_ERROR, \ WARN_HTTP_DECOMPRESS_ERROR, WARN_HTTP_UNSUPPORTED_ENCODING, \ WARN_HTTP_AUTH_UNKNOWN, WARN_HTTP_AUTH_UNAUTHORIZED @@ -435,16 +435,12 @@ class HttpUrl (internpaturl.InternPatternUrl, proxysupport.ProxySupport, pooledc redirected, self.recursion_level, self.aggregate, parent_url=self.parent_url, base_ref=self.base_ref, line=self.line, column=self.column, name=self.name) - msg = _("Redirection to URL `%(newurl)s' with different scheme" - " found; the original URL was `%(url)s'.") % \ - {"url": self.url, "newurl": newobj.url} if set_result: - self.add_warning(msg, tag=WARN_HTTP_WRONG_REDIRECT) self.set_result(_("syntax OK")) # append new object to queue self.aggregate.urlqueue.put(newobj) return False - raise LinkCheckerError(msg) + raise LinkCheckerError(_('Cannot redirect to different scheme without result')) return True def check301status (self): diff --git a/tests/checker/test_http_redirect.py b/tests/checker/test_http_redirect.py index 54480bee..08a629dd 100644 --- a/tests/checker/test_http_redirect.py +++ b/tests/checker/test_http_redirect.py @@ -82,7 +82,6 @@ class TestHttpRedirect (HttpServerTest): u"cache key %s" % nurl, u"real url %s" % nurl, u"info Redirected to `%s'." % rurl, - u"warning Redirection to URL `%s' with different scheme found; the original URL was `%s'." % (rurl, nurl), u"valid", u"url %s" % rurl, u"cache key %s" % rurl, diff --git a/tests/checker/test_https_redirect.py b/tests/checker/test_https_redirect.py index 599bbae8..68e1c56c 100644 --- a/tests/checker/test_https_redirect.py +++ b/tests/checker/test_https_redirect.py @@ -35,7 +35,6 @@ class TestHttpsRedirect (HttpServerTest): u"cache key %s" % nurl, u"real url %s" % url, u"info Redirected to `%s'." % rurl.replace('http:', 'https:'), - u"warning Redirection to URL `%s' with different scheme found; the original URL was `%s'." % (rurl.replace('http:', 'https:'), nurl), u"valid", u"url %s" % rurl, u"cache key %s" % rurl,