use python 2.4

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

Makefile

@@ -1,5 +1,5 @@
 # This Makefile is only used by developers.
-PYVER := 2.3
+PYVER := 2.4
 PYTHON := python$(PYVER)
 PACKAGE := linkchecker
 NAME = $(shell $(PYTHON) setup.py --name)

config/reindent.py

@@ -1,4 +1,4 @@
-#! /usr/bin/python2.3
+#! /usr/bin/python2.4
 
 # Released to the public domain, by Tim Peters, 03 October 2000.
 

debian/changelog

@@ -1,6 +1,7 @@
 linkchecker (2.3-1) unstable; urgency=low
 
   * New upstream release.
+  * Depend on python 2.4 packages.
 
  -- Bastian Kleineidam <calvin@debian.org>  Mon, 24 Jan 2005 20:24:12 +0100
 

debian/control

@@ -2,14 +2,14 @@ Source: linkchecker
 Section: web
 Priority: optional
 Maintainer: Bastian Kleineidam <calvin@debian.org>
-Build-Depends: python-dev (>= 2.3), python-dev (<< 2.4), python, debhelper (>= 4.1.51), gettext, cdbs
+Build-Depends: python2.4-dev, python, debhelper (>= 4.1.51), gettext, cdbs
 Standards-Version: 3.6.1
 
 Package: linkchecker
 Architecture: any
-Depends: ${python:Depends}, python-optcomplete
+Depends: ${python:Depends}, python2.4-optcomplete
 Conflicts: linkchecker-ssl
-Suggests: apache | httpd, python-psyco
+Suggests: apache | httpd, python2.4-psyco
 Description: check HTML documents for broken links
  Features:
   o recursive checking

debian/rules

@@ -9,7 +9,7 @@ include /usr/share/cdbs/1/class/python-distutils.mk
 PACKAGE = linkchecker
 ROOT = $(CURDIR)/debian/$(PACKAGE)
 DOCDIR = $(ROOT)/usr/share/doc/$(PACKAGE)
-PYTHON = python
+PYTHON = python2.4
 CGIDIR = $(ROOT)/usr/lib/cgi-bin/lconline
 HTMLDIR = $(ROOT)/var/www/lconline
 SHARE = $(ROOT)/usr/share/linkchecker

doc/Makefile

@@ -9,7 +9,7 @@ all: $(HTMLFILES)
 	./rest2htmlnav --stylesheet-path=lc.css --time $< $@
 
 nav: all
-	python bfknav.py
+	python2.4 bfknav.py
 
 homepage: nav
 	cp *.html *.css *.jpg *.png $(HTMLDIR)/htdocs

doc/documentation.html

@@ -29,6 +29,7 @@ window.onload = function() {
 <a href="./upgrading.html">Upgrading</a>
 <span>Documentation</span>
 <a href="./other.html">Other</a>
+<a href="./robots.html">Robots</a>
 
 </div>
 </div>

doc/index.html

@@ -27,6 +27,7 @@ window.onload = function() {
 <a href="./upgrading.html">Upgrading</a>
 <a href="./documentation.html">Documentation</a>
 <a href="./other.html">Other</a>
+<a href="./robots.html">Robots</a>
 
 </div>
 </div>

doc/install.html

@@ -27,6 +27,7 @@ window.onload = function() {
 <a href="./upgrading.html">Upgrading</a>
 <a href="./documentation.html">Documentation</a>
 <a href="./other.html">Other</a>
+<a href="./robots.html">Robots</a>
 
 </div>
 </div>
@@ -52,7 +53,7 @@ This is available in gettext &gt;= 0.12.</p>
 </li>
 </ol>
 </li>
-<li><p class="first">Python &gt;= 2.3 from <a class="reference" href="http://www.python.org/">http://www.python.org/</a> with zlib support</p>
+<li><p class="first">Python &gt;= 2.4 from <a class="reference" href="http://www.python.org/">http://www.python.org/</a> with zlib support</p>
 <p>Be sure to also have installed the included distutils module.
 On most distributions, the distutils module is included in
 an extra &quot;python-dev&quot; package.</p>
@@ -69,7 +70,7 @@ Psyco from <a class="reference" href="http://psyco.sourceforge.net/">http://psyc
 <div class="section" id="requirements-for-windows">
 <h1><a name="requirements-for-windows">Requirements for Windows</a></h1>
 <ol class="arabic simple">
-<li>Install Python &gt;= 2.3 from <a class="reference" href="http://www.python.org/">http://www.python.org/</a>
+<li>Install Python &gt;= 2.4 from <a class="reference" href="http://www.python.org/">http://www.python.org/</a>
 [<a class="reference" href="http://www.python.org/ftp/python/2.4/python-2.4.msi">http://www.python.org/ftp/python/2.4/python-2.4.msi</a>]</li>
 <li><em>Only needed if you compile from source:</em>
 install the MinGW suite from <a class="reference" href="http://mingw.sourceforge.net/">http://mingw.sourceforge.net/</a>
@@ -211,7 +212,7 @@ working</li>
 </div>
 <hr class="docutils footer" />
 <div class="footer">
-Generated on: 2005-01-20 21:34 UTC.
+Generated on: 2005-01-24 20:28 UTC.
 </div>
 </body>
 </html>

doc/install.txt

@@ -29,7 +29,7 @@ Requirements for Unix/Linux or Mac OS X
       from the source files, you will need xgettext with Python support.
       This is available in gettext >= 0.12.
 
-2. Python >= 2.3 from http://www.python.org/ with zlib support
+2. Python >= 2.4 from http://www.python.org/ with zlib support
    
    Be sure to also have installed the included distutils module.
    On most distributions, the distutils module is included in
@@ -45,7 +45,7 @@ Requirements for Unix/Linux or Mac OS X
 Requirements for Windows
 ------------------------
 
-1. Install Python >= 2.3 from http://www.python.org/
+1. Install Python >= 2.4 from http://www.python.org/
    [http://www.python.org/ftp/python/2.4/python-2.4.msi]
 
 2. *Only needed if you compile from source:*

doc/other.html

@@ -27,6 +27,7 @@ window.onload = function() {
 <a href="./upgrading.html">Upgrading</a>
 <a href="./documentation.html">Documentation</a>
 <span>Other</span>
+<a href="./robots.html">Robots</a>
 
 </div>
 </div>

doc/rest2htmlnav

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.4
 
 # Author: David Goodger
 # Contact: goodger@users.sourceforge.net

doc/upgrading.html

@@ -27,6 +27,7 @@ window.onload = function() {
 <span>Upgrading</span>
 <a href="./documentation.html">Documentation</a>
 <a href="./other.html">Other</a>
+<a href="./robots.html">Robots</a>
 
 </div>
 </div>

linkcheck/checker/nntpurl.py

@@ -74,7 +74,7 @@ class NntpUrl (urlbase.UrlBase):
         while tries < 5:
             tries += 1
             try:
-                nntp = NNTP(nntpserver, usenetrc=False)
+                nntp = nntplib.NNTP(nntpserver, usenetrc=False)
             except nntplib.error_perm:
                 value = sys.exc_info()[1]
                 if re.compile("^50[45]").search(str(value)):

linkchecker

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #

test/get.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #

test/head.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify

test/parsefile.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python2.3
+#!/usr/bin/python2.4
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify

test/regrtest.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.4
 # -*- coding: iso-8859-1 -*-
 
 # this file is _not_ the original Python2 regression test suite.

test/run.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 # run python interpreter with current dir as search path, and remove all
 # locale and proxy settings
-env -u ftp_proxy -u http_proxy -u LANGUAGE -u LC_ALL -u LC_CTYPE LANG=C PYTHONPATH=`pwd` python2.3 $*
+env -u ftp_proxy -u http_proxy -u LANGUAGE -u LC_ALL -u LC_CTYPE LANG=C PYTHONPATH=`pwd` python2.4 $*