See ChangeLog

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

ChangeLog

@@ -1,3 +1,6 @@
+30.3.2000 Version 1.1.4
+	* fixed missing self.mime assignment in HttpUrlData.py
+
 28.3.2000
 	* fixed wrong position of configuration file option in Config.py
 	* option -W is now -F, -W is a new option for inspecting

Makefile

@@ -19,10 +19,10 @@ clean:
 	rm -rf $(ALLPACKAGES) $(PACKAGE)-out.*
 
 install:
-	./setup.py install --destdir=$(DESTDIR)
+	./setup.py install --prefix=/tmp/usr --exec-prefix=/tmp/usr
+	cp -a /tmp/usr/* $(DESTDIR)/usr
 	install -c -m 644 linkcheckerrc $(DESTDIR)/etc
 	install -c -m 644 DNS/README $(DESTDIR)/usr/share/doc/$(PACKAGE)/README.dns
-	install -c -m 644 distutils/README $(DESTDIR)/usr/share/doc/$(PACKAGE)/README.distutils
 
 dist:
 	./setup.py sdist

linkcheck/HttpUrlData.py

@@ -122,7 +122,7 @@ class HttpUrlData(UrlData):
         if not self.data:
             self.closeConnection()
             t = time.time()
-            self._getHttpRequest("GET")
+            status, statusText, self.mime = self._getHttpRequest("GET")
             self.urlConnection = self.urlConnection.getfile()
             self.data = StringUtil.stripHtmlComments(self.urlConnection.read())
             self.downloadtime = time.time() - t

linkcheck/TelnetUrlData.py

@@ -1,4 +1,4 @@
-import telnetlib,re
+import telnetlib,re,string
 from HostCheckingUrlData import HostCheckingUrlData
 from UrlData import LinkCheckerException
 

linkchecker

@@ -6,76 +6,76 @@ if sys.version[:5] < "1.5.2":
     print "This program requires Python 1.5.2 or later."
     sys.exit(1)
 
-# add the path to linkcheck module if you install it manually somewhere
-#sys.path.append("/home/calvin/projects/linkchecker")
+# add the path to linkcheck module if you do not install with distutils
+sys.path.append("/home/calvin/projects/linkchecker")
 import getopt,re,string,linkcheck
 
 Usage = """USAGE\tlinkchecker [options] file_or_url...
 
 OPTIONS
 -a, --anchors
-	Check anchor references. Default is don't check anchors.
+        Check anchor references. Default is don't check anchors.
 -D, --debug
-	Print additional debugging information.
+        Print additional debugging information.
 -e regex, --extern=regex
-	Assume urls that match the given expression as extern.
-	Only intern HTTP links are checked recursively.
+        Assume urls that match the given expression as extern.
+        Only intern HTTP links are checked recursively.
 -f file, --config=file
-	Use file as configuration file. Pylice first searches
-	~/.linkcheckerrc and then /etc/linkcheckerrc
-	(under Windows <path-to-program>\\linkcheckerrc).
+        Use file as configuration file. Pylice first searches
+        ~/.linkcheckerrc and then /etc/linkcheckerrc
+        (under Windows <path-to-program>\\linkcheckerrc).
 -F name, --file-output=name
-	Same as output, but write to a file linkchecker-out.<name>.
-	If the file already exists, it is overwritten.
-	You can specify this option more than once.
-	Default is no file output.
+        Same as output, but write to a file linkchecker-out.<name>.
+        If the file already exists, it is overwritten.
+        You can specify this option more than once.
+        Default is no file output.
 -i regex, --intern=regex
-	Assume urls that match the given expression as intern.
+        Assume urls that match the given expression as intern.
 -h, --help
-	Help me! Print usage information for this program.
+        Help me! Print usage information for this program.
 -l, --allowdeny
-	Swap checking order to intern/extern. Default checking order
-	is extern/intern.
+        Swap checking order to intern/extern. Default checking order
+        is extern/intern.
 -o name, --output=name
-	Specify output as """+linkcheck.Config.LoggerKeys+""".
-	Default is text.
+        Specify output as """+linkcheck.Config.LoggerKeys+""".
+        Default is text.
 -p pwd, --password=pwd
-	Try given password for HTML and FTP authorization.
-	Default is 'guest@'. See -u.
+        Try given password for HTML and FTP authorization.
+        Default is 'guest@'. See -u.
 -P host[:port], --proxy=host[:port]
-	Use specified proxy for HTTP requests.
-	Standard port is 8080. Default is to use no proxy.
+        Use specified proxy for HTTP requests.
+        Standard port is 8080. Default is to use no proxy.
 -q, --quiet
-	Quiet operation. This is only useful with -F.
+        Quiet operation. This is only useful with -F.
 -r depth, --recursion-level=depth
-	Check recursively all links up to given depth (depth >= 0).
-	Default depth is 1.
+        Check recursively all links up to given depth (depth >= 0).
+        Default depth is 1.
 -R, --robots-txt
-	Obey the robots exclusion standard.
+        Obey the robots exclusion standard.
 -s, --strict
-	Check only syntax of extern links, do not try to connect to them.
+        Check only syntax of extern links, do not try to connect to them.
 -t num, --threads=num
-	Generate no more than num threads. Default number of threads is 5.
-	To disable threading specify a non-positive number.
+        Generate no more than num threads. Default number of threads is 5.
+        To disable threading specify a non-positive number.
 -u name, --user=name
-	Try given username for HTML and FTP authorization.
-	Default is 'anonymous'. See -p.
+        Try given username for HTML and FTP authorization.
+        Default is 'anonymous'. See -p.
 -V, --version
-	Print version and exit.
+        Print version and exit.
 -v, --verbose
-	Log all checked URLs (implies -w). Default is to log only invalid
-	URLs.
+        Log all checked URLs (implies -w). Default is to log only invalid
+        URLs.
 -w, --warnings
-	Log warnings.
+        Log warnings.
 -W, --warning-regex
-	Define a regular expression which prints a warning if it matches
-	any content of the checked link.
-	This applies of course only to pages which are valid, so we can
-	get their content.
-	You can use this to check for pages that contain some form of
-	error message, for example "This page has moved" or
-	"Oracle Application Server error".
-        Implies -w.
+        Define a regular expression which prints a warning if it matches
+        any content of the checked link.
+        This applies of course only to pages which are valid, so we can
+        get their content.
+        You can use this to check for pages that contain some form of
+        error message, for example "This page has moved" or
+        "Oracle Application Server error".
+        This option implies -w.
 """
 
 Notes = """NOTES
@@ -89,7 +89,8 @@ o If you have your system configured to automatically establish a
 o Javascript links are currently ignored
 o If your platform does not support threading, linkchecker assumes -t0
 o You can supply multiple user/password pairs in a configuration file
-o Cookies are not accepted by LinkChecker.
+o Cookies are not accepted by LinkChecker and never will be. Cookies
+  are dumb. Use Zope with session support!
 """
 
 Examples = """EXAMPLES

setup.py

@@ -13,9 +13,7 @@ setup (name = "linkchecker",
        # uncomment ext_modules to enable HTTPS support
        # you must have an SSL library and the Python header
        # files installed
-       #ext_modules = [('ssl', {'sources': ['ssl.c'],
-       #                 'include_dirs': ['/usr/include/openssl'],
-       #                 'libs': ['ssl']})],
-       scripts = [('linkchecker.bat', 'nt')],
-       programs = ['linkchecker'],
+       ext_modules = [('ssl', {'sources': ['ssl.c'],
+                        'include_dirs': ['/usr/include/openssl'],
+                        'libs': ['ssl']})],
        )