really fix the import error

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

DNS/lazy.py

@@ -10,7 +10,7 @@ def revlookup(name):
     # this will only return one of any records returned.
     return Base.DnsRequest(b, qtype = 'ptr').req().answers[0]['data']
 
-def mxlookup(name, protocol="udp"):
+def mxlookup(name, protocol="tcp"):
     """
     convenience routine for doing an MX lookup of a name. returns a
     sorted list of (preference, mail exchanger) records

Makefile

@@ -29,6 +29,12 @@ distclean: clean cleandeb
 	rm -f VERSION _$(PACKAGE)_configdata.py MANIFEST Packages.gz
 	# clean aborted dist builds and -out files
 	rm -f $(PACKAGE)-*
+	rm -rf linkcheckssl/ssl.so
+
+.PHONY: localbuild
+localbuild:
+	./setup.py build
+	cp -f build/lib.linux-i686-2.0/linkcheckssl/ssl.so linkcheckssl
 
 .PHONY: cleandeb
 cleandeb:

linkcheck/HttpUrlData.py

@@ -190,7 +190,8 @@ class HttpUrlData(UrlData):
             self.proxy = splittype(self.proxy)[1]
             self.proxy = splithost(self.proxy)[0]
             self.proxyuser, self.proxy = splituser(self.proxy)
-            self.proxyuser, self.proxypass = splitpasswd(self.proxyuser)
+            if self.proxyuser:
+                self.proxyuser, self.proxypass = splitpasswd(self.proxyuser)
 
 
     def _getHttpRequest(self, method="HEAD"):

linkcheck/UrlData.py

@@ -220,7 +220,7 @@ class UrlData:
         try:
 	    self.buildUrl()
             self.extern = self._getExtern(config)
-        except linkcheck.error:
+        except tuple(ExcList):
             type, value = sys.exc_info()[:2]
             self.setError(str(value))
             self.logMe(config)
@@ -249,7 +249,7 @@ class UrlData:
                 self.checkAnchors(self.urlTuple[5])
         except tuple(ExcList):
             type, value = sys.exc_info()[:2]
-            print type, value
+            #print type, value
             self.setError(str(value))
 
         # check content
@@ -268,6 +268,7 @@ class UrlData:
             self.parseUrl(config)
         self.closeConnection()
         self.logMe(config)
+        debug(BRING_IT_ON, "caching")
         self.putInCache(config)
 
 
@@ -339,7 +340,7 @@ class UrlData:
                 if pat.search(self.url):
                     return (1, strict)
             return (1,0)
-        raise ValueError, "internal error in UrlData._getExtern"
+        raise linkcheck.error, "internal error in UrlData._getExtern"
 
 
     def getContent(self):

setup.py

@@ -248,7 +248,7 @@ data_files = [('share/locale/de/LC_MESSAGES',
 if os.name=="nt":
     scripts.append("linkchecker.bat")
 else:
-    data_files.append()
+    data_files.append(('share/linkchecker/examples',["linkchecker.bat"]))
 
 setup (name = "linkchecker",
        version = "1.3.7",

test/output/test_http

@@ -16,15 +16,15 @@ error
 url http://
 name no url
 warning Missing '/' at end of URL
-valid
+error
 url http:/
 name no url, one slash
-valid
+error
 url http:
 cached
 name no url, no slash
 warning Missing '/' at end of URL
-valid
+error
 url http://www.blubb.de/stalter&sohn
 name unquoted ampersand
 error
@@ -33,7 +33,8 @@ name unquoted
 valid
 url http://fsinfo.cs.uni-sb.de/~calvin/#isnix
 name invalid anchor
-error
+warning anchor #isnix not found
+valid
 url HtTP://WWW.hEIsE.DE
 cached
 name should be cached