boolean stuff

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

linkcheck/FileUrlData.py

@@ -125,15 +125,15 @@ class FileUrlData (UrlData):
         # guess by extension
         for ro in extensions.values():
             if ro.search(self.url):
-                return 1
+                return True
         # try to read content (can fail, so catch error)
         try:
             for ro in contents.values():
                 if ro.search(self.getContent()[:20]):
-                    return 1
+                    return True
         except IOError:
             pass
-        return None
+        return False
 
 
     def parseUrl (self):

linkcheck/FtpUrlData.py

@@ -68,8 +68,8 @@ class FtpUrlData (ProxyUrlData):
         # guess by extension
         for ro in extensions.values():
             if ro.search(self.url):
-                return 1
-        return None
+                return True
+        return False
 
 
     def parseUrl (self):

linkcheck/IgnoredUrlData.py

@@ -63,4 +63,4 @@ class IgnoredUrlData (UrlData):
         self.logMe()
 
     def hasContent (self):
-        return 0
+        return False

linkcheck/MailtoUrlData.py

@@ -126,5 +126,5 @@ class MailtoUrlData (HostCheckingUrlData):
 
 
     def hasContent (self):
-        return 0
+        return False
 

linkcheck/NntpUrlData.py

@@ -96,4 +96,4 @@ class NntpUrlData (UrlData):
 
 
     def hasContent (self):
-        return 0
+        return False

linkcheck/TelnetUrlData.py

@@ -60,5 +60,5 @@ class TelnetUrlData (HostCheckingUrlData):
 
 
     def hasContent (self):
-        return 0
+        return False
 

linkcheck/UrlData.py

@@ -190,7 +190,7 @@ class UrlData:
         self.dltime = -1
         self.dlsize = -1
         self.checktime = 0
-        self.cached = True
+        self.cached = False
         self.urlConnection = None
         self.extern = (1, 0)
         self.data = None

linkcheck/test_support.py

@@ -21,7 +21,7 @@ class TestSkipped (Error):
         """
 
 
-verbose = 1		# Flag set to 0 by regrtest.py
+verbose = True		# Flag set to 0 by regrtest.py
 
 def unload (name):
 	import sys
@@ -80,17 +80,17 @@ class TestLogger (Logger):
         pass
 
     def newUrl (self, urlData):
-        print 'url',urlData.urlName
+        print 'url', urlData.urlName
         if urlData.cached:
             print "cached"
         if urlData.name:
-            print "name",urlData.name
+            print "name", urlData.name
         if urlData.baseRef:
-            print "baseurl",urlData.baseRef
+            print "baseurl", urlData.baseRef
         if urlData.infoString:
-            print "info",urlData.infoString
+            print "info", urlData.infoString
         if urlData.warningString:
-            print "warning",urlData.warningString
+            print "warning", urlData.warningString
         if urlData.valid:
             print "valid"
         else: