From 4c0620c498d8810247156948060ab6e5b17f8f03 Mon Sep 17 00:00:00 2001 From: calvin Date: Sat, 16 Jun 2007 22:08:41 +0000 Subject: [PATCH] use default python git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@3559 e7d03fd6-7b0d-0410-9947-9c21f3af8025 --- TODO | 3 --- cgi-bin/lc.cgi | 2 +- cgi-bin/lc.fcgi | 2 +- config/reindent.py | 2 +- debian/README.Debian | 4 ++-- debian/control | 2 +- debian/control.gui | 2 +- debian/rules | 1 - doc/en/Makefile | 2 +- doc/rest2htmlnav | 2 +- gui/Makefile | 2 +- gui/simple-glade-codegen.py | 2 +- install-rpm.sh | 2 +- linkcheck/HtmlParser/Makefile | 2 +- linkchecker | 2 +- po/Makefile | 2 +- scripts/get.py | 2 +- scripts/head.py | 2 +- scripts/parsefile.py | 2 +- scripts/run.sh | 2 +- setup.cfg | 2 +- setup.py | 2 +- test.py | 2 +- 23 files changed, 22 insertions(+), 26 deletions(-) diff --git a/TODO b/TODO index 1a69ea4a..2ff301c6 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,3 @@ -- [BUGFIX] Use Py_ssize_t for indizes, according to PEP 353: - http://www.python.org/dev/peps/pep-0353/#conversion-guidelines - - [BUG REPORT] the web interface only runs on the server it is installed on. The ALLOWED_HOSTS and ALLOWED_SERVERS variables in lc.cgi don't work and are not (well) documented. diff --git a/cgi-bin/lc.cgi b/cgi-bin/lc.cgi index 888fbf47..ac9b5880 100755 --- a/cgi-bin/lc.cgi +++ b/cgi-bin/lc.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/python2.4 +#!/usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2000-2007 Bastian Kleineidam # diff --git a/cgi-bin/lc.fcgi b/cgi-bin/lc.fcgi index 196acb0c..f17d701c 100755 --- a/cgi-bin/lc.fcgi +++ b/cgi-bin/lc.fcgi @@ -1,4 +1,4 @@ -#!/usr/bin/python2.4 +#!/usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2000-2007 Bastian Kleineidam # diff --git a/config/reindent.py b/config/reindent.py index 0fc2de25..40a75c2e 100644 --- a/config/reindent.py +++ b/config/reindent.py @@ -1,4 +1,4 @@ -#! /usr/bin/python2.4 +#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Released to the public domain, by Tim Peters, 03 October 2000. diff --git a/debian/README.Debian b/debian/README.Debian index 0f9317e2..496e023c 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -9,5 +9,5 @@ script. If you want to enable access from other hosts you have to adjust the ALLOWED_HOSTS and ALLOWED_SERVERS variables in the /usr/lib/cgi-bin/lc.cgi script. -The --profile option works only if the python2.4-profiler package -is installed. +The --profile option works only if the python2.5 or the +python-profiler package is installed. diff --git a/debian/control b/debian/control index d15ffab8..3bcd9990 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: linkchecker Section: web Priority: optional Maintainer: Bastian Kleineidam -Build-Depends: python-all-dev (>= 2.3.5-11), debhelper (>= 5.0.37.2), gettext, cdbs (>= 0.4.43), python-central (>= 0.5) +Build-Depends: python-all-dev (>= 2.4), debhelper (>= 5.0.37.2), gettext, cdbs (>= 0.4.43), python-central (>= 0.5) XS-Python-Standards-Version: 0.4 XS-Python-Version: >= 2.4 Standards-Version: 3.7.2.1 diff --git a/debian/control.gui b/debian/control.gui index 4f5bbdc3..f59d71fd 100644 --- a/debian/control.gui +++ b/debian/control.gui @@ -5,7 +5,7 @@ Package: linkchecker-gui Architecture: all -Depends: linkchecker, python2.4-glade2 +Depends: linkchecker, python-glade2 Description: check websites and HTML documents for broken links (GUI version) Provides a graphical interface "glinkchecker" to check links of websites and HTML documents. diff --git a/debian/rules b/debian/rules index 3419b3de..7fdc0549 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f DEB_PYTHON_SYSTEM=pycentral -DEB_PYTHON_COMPILE_VERSION=2.4 common-install-arch:: $(MAKE) locale diff --git a/doc/en/Makefile b/doc/en/Makefile index cc6a457f..f03969be 100644 --- a/doc/en/Makefile +++ b/doc/en/Makefile @@ -14,7 +14,7 @@ clean: .PHONY: nav nav: all - python2.4 ../bfknav.py + python ../bfknav.py .PHONY: homepage homepage: nav diff --git a/doc/rest2htmlnav b/doc/rest2htmlnav index 2ae207ad..484b673a 100755 --- a/doc/rest2htmlnav +++ b/doc/rest2htmlnav @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.4 +#!/usr/bin/env python # -*- coding: iso-8859-1 -*- # Author: David Goodger diff --git a/gui/Makefile b/gui/Makefile index f23d4a3f..6b15f3dc 100644 --- a/gui/Makefile +++ b/gui/Makefile @@ -1,4 +1,4 @@ -PYVER := 2.4 +PYVER := 2.5 PYTHON := python$(PYVER) OPTS := --copyright="Copyright (C) 2005-2007 Bastian Kleineidam" \ --license=py_gpl_head.txt --threads diff --git a/gui/simple-glade-codegen.py b/gui/simple-glade-codegen.py index ae276a54..aedfbd44 100644 --- a/gui/simple-glade-codegen.py +++ b/gui/simple-glade-codegen.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.4 +#!/usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2004 Sandino Flores Moreno diff --git a/install-rpm.sh b/install-rpm.sh index f8c28426..275d7597 100644 --- a/install-rpm.sh +++ b/install-rpm.sh @@ -1,4 +1,4 @@ -python2.4 setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES +python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES # 'brp-compress' compresses the manpages without distutils knowing. # The sed scripts append ".gz" resp. ".bz2" suffixes to the affected # manpage filenames. diff --git a/linkcheck/HtmlParser/Makefile b/linkcheck/HtmlParser/Makefile index a2b8ee88..f1881792 100644 --- a/linkcheck/HtmlParser/Makefile +++ b/linkcheck/HtmlParser/Makefile @@ -1,7 +1,7 @@ # this parser needs flex >= 2.5.xx from http://lex.sf.net/ # for reentrant bison parser support! FLEX = flex -PYVER = 2.4 +PYVER = 2.5 PYTHON = python$(PYVER) all: htmllex.c htmlparse.c diff --git a/linkchecker b/linkchecker index 627701ec..a4b2a991 100755 --- a/linkchecker +++ b/linkchecker @@ -1,4 +1,4 @@ -#!/usr/bin/python2.4 +#!/usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2000-2007 Bastian Kleineidam # diff --git a/po/Makefile b/po/Makefile index 0571c069..6ccddbe2 100644 --- a/po/Makefile +++ b/po/Makefile @@ -2,7 +2,7 @@ XGETTEXT := xgettext MSGFMT := msgfmt MSGMERGE := msgmerge POSOURCES = $(shell find ../linkcheck -name \*.py) \ - ../linkchecker /usr/lib/python2.4/optparse.py + ../linkchecker /usr/lib/python2.5/optparse.py LDIR = ../share/locale PACKAGE = linkchecker TEMPLATE = $(PACKAGE).pot diff --git a/scripts/get.py b/scripts/get.py index 94cbe408..4ed1137a 100755 --- a/scripts/get.py +++ b/scripts/get.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.4 +#!/usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2004-2007 Bastian Kleineidam # diff --git a/scripts/head.py b/scripts/head.py index 6540b092..96e3d0cb 100755 --- a/scripts/head.py +++ b/scripts/head.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.4 +#!/usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2004-2007 Bastian Kleineidam # diff --git a/scripts/parsefile.py b/scripts/parsefile.py index ab461024..409ed462 100755 --- a/scripts/parsefile.py +++ b/scripts/parsefile.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.4 +#!/usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2004-2007 Bastian Kleineidam # diff --git a/scripts/run.sh b/scripts/run.sh index 580844ac..9c19f026 100755 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -2,5 +2,5 @@ # Run python interpreter with current dir as search path, and remove all # locale and proxy settings. # Set PYOPTS for options, for example PYOPTS=-O. -PYVER=2.4 +PYVER=2.5 env -u ftp_proxy -u http_proxy -u LANGUAGE -u LC_ALL -u LC_CTYPE LANG=C PYTHONPATH=`pwd` python${PYVER} ${PYOPTS:-} "$@" diff --git a/setup.cfg b/setup.cfg index bdb49df1..4674b29b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -7,7 +7,7 @@ doc_files = TODO provides = linkchecker group = Web/Utilities install_script = install-rpm.sh -python = python2.4 +python = python [bdist_wininst] install-script = install-linkchecker.py diff --git a/setup.py b/setup.py index 049c3dd9..f43a5246 100755 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.4 +#!/usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2000-2007 Bastian Kleineidam # diff --git a/test.py b/test.py index c981e037..4593b74c 100755 --- a/test.py +++ b/test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.4 +#!/usr/bin/python # -*- coding: iso-8859-1 -*- # # SchoolTool - common information systems platform for school administration