mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 04:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

v 0.8.3 -- add an option to suppress URL processing inside <PRE>,

Browse source 
by Scott <scott@chronis.icgroup.com>
This commit is contained in:
Guido van Rossum 1997-12-09 16:04:46 +00:00
parent fc5d8b198a
commit b1823ad83f
3 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Tools/faqwiz/README
View file

@ -2,8 +2,8 @@ FAQ Wizard
---------- ----------
Author: Guido van Rossum <guido@python.org> Author: Guido van Rossum <guido@python.org>
Version: 0.8 Version: 0.8.3
Date: 27 August 1997 Date: 8 December 1997
This is a CGI program that maintains a user-editable FAQ. It uses RCS This is a CGI program that maintains a user-editable FAQ. It uses RCS
@ -18,7 +18,7 @@ importable module. The actual script in cgi-bin is minimal.
Files: Files:
faqw.py executable script to be edited and installed in cgi-bin faqw.py executable script to be edited and installed in cgi-bin
faqwin.py main module, lives in same directory as FAQ entry files faqwiz.py main module, lives in same directory as FAQ entry files
faqconf.py main configuration module faqconf.py main configuration module
faqcust.py additional local customization module (optional) faqcust.py additional local customization module (optional)

5
Tools/faqwiz/faqconf.py
View file

@ -29,6 +29,9 @@ RCSBINDIR = "/depot/gnu/plat/bin/" # Directory containing RCS commands
MAXHITS = 10 # Max #hits to be shown directly MAXHITS = 10 # Max #hits to be shown directly
COOKIE_LIFETIME = 28*24*3600 # Cookie expiration in seconds COOKIE_LIFETIME = 28*24*3600 # Cookie expiration in seconds
# (28*24*3600 = 28 days = 4 weeks) # (28*24*3600 = 28 days = 4 weeks)
PROCESS_PREFORMAT = 1 # toggle whether preformatted text
# will replace urls and emails with
# HTML links
# Markers appended to title to indicate recently change # Markers appended to title to indicate recently change
# (may contain HTML, e.g. <IMG>); and corresponding # (may contain HTML, e.g. <IMG>); and corresponding
@ -46,7 +49,7 @@ entries marked with * were changed within the last 7 days.)
# Version -- don't change unless you edit faqwiz.py # Version -- don't change unless you edit faqwiz.py
WIZVERSION = "0.8.2" # FAQ Wizard version WIZVERSION = "0.8.3" # FAQ Wizard version
# This parameter is normally overwritten with a dynamic value # This parameter is normally overwritten with a dynamic value

13
Tools/faqwiz/faqwiz.py
View file

@ -70,7 +70,7 @@ def emit(format, *args, **kw):
translate_prog = None translate_prog = None
def translate(text): def translate(text, pre=0):
global translate_prog global translate_prog
if not translate_prog: if not translate_prog:
url = '\(http\|ftp\|https\)://[^ \t\r\n]*' url = '\(http\|ftp\|https\)://[^ \t\r\n]*'
@ -90,10 +90,13 @@ def translate(text):
while url[-1] in ');:,.?\'"': while url[-1] in ');:,.?\'"':
url = url[:-1] url = url[:-1]
url = escape(url) url = escape(url)
if ':' in url: if not pre or (pre and PROCESS_PREFORMAT):
repl = '<A HREF="%s">%s</A>' % (url, url) if ':' in url:
repl = '<A HREF="%s">%s</A>' % (url, url)
else:
repl = '<A HREF="mailto:%s">&lt;%s&gt;</A>' % (url, url)
else: else:
repl = '<A HREF="mailto:%s">&lt;%s&gt;</A>' % (url, url) repl = url
list.append(repl) list.append(repl)
i = i + len(url) i = i + len(url)
j = len(text) j = len(text)
@ -292,7 +295,7 @@ class FaqEntry:
print '<PRE>' print '<PRE>'
pre = 1 pre = 1
if '/' in line or '@' in line: if '/' in line or '@' in line:
line = translate(line) line = translate(line, pre)
elif '<' in line or '&' in line: elif '<' in line or '&' in line:
line = escape(line) line = escape(line)
if not pre and '*' in line: if not pre and '*' in line: