commit b1823ad83f4dad74eb13b470f2878d23b9fa7f3b
author Guido van Rossum <guido@python.org> Tue Dec 09 16:04:46 1997 +0000
committer Guido van Rossum <guido@python.org> Tue Dec 09 16:04:46 1997 +0000
tree 41599b9bedb6a4c261447df9ffecaa18ae64ea18
parent fc5d8b198aa6e406102e06067fa0e86b2d600a49

v 0.8.3 -- add an option to suppress URL processing inside <PRE>,
by Scott <scott@chronis.icgroup.com>

Tools/faqwiz/faqwiz.py

diff --git a/Tools/faqwiz/faqwiz.py b/Tools/faqwiz/faqwiz.py
index 5ceb2f9..9282b36 100644
--- a/Tools/faqwiz/faqwiz.py
+++ b/Tools/faqwiz/faqwiz.py
@@ -70,7 +70,7 @@
 
 translate_prog = None
 
-def translate(text):
+def translate(text, pre=0):
     global translate_prog
     if not translate_prog:
 	url = '\(http\|ftp\|https\)://[^ \t\r\n]*'
@@ -90,10 +90,13 @@
 	while url[-1] in ');:,.?\'"':
 	    url = url[:-1]
 	url = escape(url)
-	if ':' in url:
-	    repl = '<A HREF="%s">%s</A>' % (url, url)
+	if not pre or (pre and PROCESS_PREFORMAT):
+	    if ':' in url:
+		repl = '<A HREF="%s">%s</A>' % (url, url)
+	    else:
+		repl = '<A HREF="mailto:%s">&lt;%s&gt;</A>' % (url, url)
 	else:
-	    repl = '<A HREF="mailto:%s">&lt;%s&gt;</A>' % (url, url)
+	    repl = url
 	list.append(repl)
 	i = i + len(url)
     j = len(text)
@@ -292,7 +295,7 @@
 			print '<PRE>'
 			pre = 1
 		if '/' in line or '@' in line:
-		    line = translate(line)
+		    line = translate(line, pre)
 		elif '<' in line or '&' in line:
 		    line = escape(line)
  		if not pre and '*' in line: