updated

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

ChangeLog

@@ -16,6 +16,8 @@
     Changed files: linkcheck/HttpUrlData.py
   * Updated german documentation
     Changed files: po/de.po
+  * Oops, an FTP proxy is not used. Will make in the next release.
+    Changed files: linkcheck/FtpUrlData.py
 
 1.6.2:
   * Warn about unknown Content-Encodings. Dont parse HTML in this case.

FAQ

@@ -4,6 +4,7 @@ Q: LinkChecker produced an error, but my web page is ok with
 A: Please check your web pages first. Are they really ok? Use
    a syntax highlighting editor! Use HTML Tidy from www.w3c.org!
    Check if the web server is accepting HEAD requests as well.
+   Check if you are using a Proxy which produces the error.
 
 
 Q: I still get an error, but the page is definitely ok.

linkcheck/FtpUrlData.py

@@ -31,6 +31,8 @@ class FtpUrlData (UrlData):
     """
 
     def checkConnection (self):
+        _proxy = self.config["proxy"].get(self.scheme)
+        # XXX proxy support (we support http and ftp!)
         _user, _password = self._getUserPassword()
         if _user is None or _password is None:
             raise linkcheck.error, linkcheck._("No user or password found")

linkcheck/HttpUrlData.py

@@ -212,7 +212,7 @@ class HttpUrlData (UrlData):
 	"""
         if self.proxy:
             host = self.proxy
-            self.setInfo(linkcheck._("Using Proxy %s")%`self.proxy`)
+            self.setInfo(linkcheck._("Using HTTP Proxy %s")%`self.proxy`)
         else:
             host = self.urlTuple[1]
         Config.debug(HURT_ME_PLENTY, "host", host)

linkcheck/__init__.py

@@ -48,7 +48,7 @@ def init_gettext ():
         _ = lambda s: s
 init_gettext()
 
-import Config
+import Config, UrlData
 from debuglevels import *
 debug = Config.debug
 

test/test_base.py

@@ -1,4 +1,4 @@
-import os, linkcheck, linkcheck.UrlData
+import os, linkcheck
 config = linkcheck.Config.Configuration()
 config.addLogger('test', linkcheck.test_support.TestLogger)
 config['recursionlevel'] = 1

test/test_file.py

@@ -1,4 +1,4 @@
-import os, linkcheck, linkcheck.UrlData
+import os, linkcheck
 config = linkcheck.Config.Configuration()
 config.addLogger('test', linkcheck.test_support.TestLogger)
 config['recursionlevel'] = 1

test/test_ftp.py

@@ -1,4 +1,4 @@
-import os, linkcheck, linkcheck.UrlData
+import os, linkcheck
 config = linkcheck.Config.Configuration()
 config.addLogger('test', linkcheck.test_support.TestLogger)
 config['recursionlevel'] = 1

test/test_http.py

@@ -1,4 +1,4 @@
-import os, linkcheck, linkcheck.UrlData
+import os, linkcheck
 config = linkcheck.Config.Configuration()
 config.addLogger('test', linkcheck.test_support.TestLogger)
 config['recursionlevel'] = 1

test/test_https.py

@@ -1,4 +1,4 @@
-import os, linkcheck, linkcheck.UrlData
+import os, linkcheck
 config = linkcheck.Config.Configuration()
 config.addLogger('test', linkcheck.test_support.TestLogger)
 config['recursionlevel'] = 1

test/test_mail.py

@@ -1,4 +1,4 @@
-import os, linkcheck, linkcheck.UrlData
+import os, linkcheck
 config = linkcheck.Config.Configuration()
 config.addLogger('test', linkcheck.test_support.TestLogger)
 config['recursionlevel'] = 1

test/test_misc.py

@@ -1,4 +1,4 @@
-import os, linkcheck, linkcheck.UrlData
+import os, linkcheck
 config = linkcheck.Config.Configuration()
 config.addLogger('test', linkcheck.test_support.TestLogger)
 config['recursionlevel'] = 1

test/test_news.py

@@ -1,4 +1,4 @@
-import os, linkcheck, linkcheck.UrlData
+import os, linkcheck
 config = linkcheck.Config.Configuration()
 config.addLogger('test', linkcheck.test_support.TestLogger)
 config['recursionlevel'] = 1