diff --git a/Makefile b/Makefile index 1b3d945c..76534a1a 100644 --- a/Makefile +++ b/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) diff --git a/config/reindent.py b/config/reindent.py index 39b52517..1f89488f 100644 --- a/config/reindent.py +++ b/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. diff --git a/debian/changelog b/debian/changelog index db2fe2cf..e42172f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ linkchecker (2.3-1) unstable; urgency=low * New upstream release. + * Depend on python 2.4 packages. -- Bastian Kleineidam Mon, 24 Jan 2005 20:24:12 +0100 diff --git a/debian/control b/debian/control index 50d475ed..ff451ff6 100644 --- a/debian/control +++ b/debian/control @@ -2,14 +2,14 @@ Source: linkchecker Section: web Priority: optional Maintainer: Bastian Kleineidam -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 diff --git a/debian/rules b/debian/rules index d374a9e4..9f18461d 100755 --- a/debian/rules +++ b/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 diff --git a/doc/Makefile b/doc/Makefile index e8a0fbc1..10271155 100644 --- a/doc/Makefile +++ b/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 diff --git a/doc/documentation.html b/doc/documentation.html index 3c10f0e3..c6ee76b2 100644 --- a/doc/documentation.html +++ b/doc/documentation.html @@ -29,6 +29,7 @@ window.onload = function() { Upgrading Documentation Other +Robots diff --git a/doc/index.html b/doc/index.html index 4e50c4b5..7fd0905c 100644 --- a/doc/index.html +++ b/doc/index.html @@ -27,6 +27,7 @@ window.onload = function() { Upgrading Documentation Other +Robots diff --git a/doc/install.html b/doc/install.html index 39e98e9f..763499d4 100644 --- a/doc/install.html +++ b/doc/install.html @@ -27,6 +27,7 @@ window.onload = function() { Upgrading Documentation Other +Robots @@ -52,7 +53,7 @@ This is available in gettext >= 0.12.

-

  • Python >= 2.3 from http://www.python.org/ with zlib support

    +

  • 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 an extra "python-dev" package.

    @@ -69,7 +70,7 @@ Psyco from http://psyc

    Requirements for Windows

      -
    1. Install Python >= 2.3 from http://www.python.org/ +
    2. Install Python >= 2.4 from http://www.python.org/ [http://www.python.org/ftp/python/2.4/python-2.4.msi]
    3. Only needed if you compile from source: install the MinGW suite from http://mingw.sourceforge.net/ @@ -211,7 +212,7 @@ working
    -Generated on: 2005-01-20 21:34 UTC. +Generated on: 2005-01-24 20:28 UTC.
    diff --git a/doc/install.txt b/doc/install.txt index bce370e1..a0e5c71c 100644 --- a/doc/install.txt +++ b/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:* diff --git a/doc/other.html b/doc/other.html index 002b5584..7f9d43aa 100644 --- a/doc/other.html +++ b/doc/other.html @@ -27,6 +27,7 @@ window.onload = function() { Upgrading Documentation Other +Robots diff --git a/doc/rest2htmlnav b/doc/rest2htmlnav index ee9fa1c7..d29fe051 100755 --- a/doc/rest2htmlnav +++ b/doc/rest2htmlnav @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.4 # Author: David Goodger # Contact: goodger@users.sourceforge.net diff --git a/doc/upgrading.html b/doc/upgrading.html index 19465c3f..4f307b7a 100644 --- a/doc/upgrading.html +++ b/doc/upgrading.html @@ -27,6 +27,7 @@ window.onload = function() { Upgrading Documentation Other +Robots diff --git a/linkcheck/checker/nntpurl.py b/linkcheck/checker/nntpurl.py index d113f9b7..eb762b68 100644 --- a/linkcheck/checker/nntpurl.py +++ b/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)): diff --git a/linkchecker b/linkchecker index 2f1102bb..c57d36b1 100755 --- a/linkchecker +++ b/linkchecker @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2.4 # -*- coding: iso-8859-1 -*- # Copyright (C) 2000-2005 Bastian Kleineidam # diff --git a/test/get.py b/test/get.py index f12b8324..baf62798 100644 --- a/test/get.py +++ b/test/get.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2.4 # -*- coding: iso-8859-1 -*- # Copyright (C) 2004-2005 Bastian Kleineidam # diff --git a/test/head.py b/test/head.py index 7cb6eff4..3ed262ee 100644 --- a/test/head.py +++ b/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 diff --git a/test/parsefile.py b/test/parsefile.py index 9b168050..21fbf46d 100755 --- a/test/parsefile.py +++ b/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 diff --git a/test/regrtest.py b/test/regrtest.py index 2b7d9e2e..305634a2 100755 --- a/test/regrtest.py +++ b/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. diff --git a/test/run.sh b/test/run.sh index 090eacb6..3dcc1261 100755 --- a/test/run.sh +++ b/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 $*