[Python-checkins] CVS: python/dist/src/Tools/faqwiz faqconf.py,1.23,1.24
Guido van Rossum
python-dev@python.org
Thu, 30 Mar 2000 19:55:57 -0500 (EST)
Update of /projects/cvsroot/python/dist/src/Tools/faqwiz
In directory eric:/projects/python/develop/guido/src/Tools/faqwiz
Modified Files:
faqconf.py
Log Message:
New version 1.0.4. I'm sure someone mailed me these patches but I
can't remember who. :-) Changes:
- Owner name+email made generic instead of GvR
- Support for Windows NT (running from a .bat file)
- DOcument <HTML>...</HTML> tags
Index: faqconf.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/faqwiz/faqconf.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** faqconf.py 1998/12/23 21:32:52 1.23
--- faqconf.py 2000/03/31 00:55:54 1.24
***************
*** 18,23 ****
SHORTNAME = "Generic" # FAQ name with "FAQ" omitted
PASSWORD = "" # Password for editing
! OWNERNAME = "GvR" # Name for feedback
! OWNEREMAIL = "guido@python.org" # Email for feedback
HOMEURL = "http://www.python.org" # Related home page
HOMENAME = "Python home" # Name of related home page
--- 18,23 ----
SHORTNAME = "Generic" # FAQ name with "FAQ" omitted
PASSWORD = "" # Password for editing
! OWNERNAME = "FAQ owner" # Name for feedback
! OWNEREMAIL = "nobody@anywhere.org" # Email for feedback
HOMEURL = "http://www.python.org" # Related home page
HOMENAME = "Python home" # Name of related home page
***************
*** 50,60 ****
# Version -- don't change unless you edit faqwiz.py
! WIZVERSION = "1.0.3" # FAQ Wizard version
- # This parameter is normally overwritten with a dynamic value
-
- FAQCGI = 'faqw.py' # Relative URL of the FAQ cgi script
import os, sys
! FAQCGI = os.path.basename(sys.argv[0]) or FAQCGI
del os, sys
--- 50,66 ----
# Version -- don't change unless you edit faqwiz.py
! WIZVERSION = "1.0.4" # FAQ Wizard version
import os, sys
! if os.name in ['nt',]:
! # On NT we'll probably be running python from a batch file,
! # so sys.argv[0] is not helpful
! FAQCGI = 'faq.bat' # Relative URL of the FAQ cgi script
! # LOGNAME is not typically set on NT
! os.environ[ 'LOGNAME' ] = "FAQWizard"
! else:
! # This parameter is normally overwritten with a dynamic value
! FAQCGI = 'faqw.py' # Relative URL of the FAQ cgi script
! FAQCGI = os.path.basename(sys.argv[0]) or FAQCGI
del os, sys
***************
*** 92,101 ****
# RCS commands
! SH_RLOG = RCSBINDIR + "rlog %(file)s </dev/null 2>&1"
! SH_RLOG_H = RCSBINDIR + "rlog -h %(file)s </dev/null 2>&1"
! SH_RDIFF = RCSBINDIR + "rcsdiff -r%(prev)s -r%(rev)s %(file)s </dev/null 2>&1"
! SH_REVISION = RCSBINDIR + "co -p%(rev)s %(file)s </dev/null 2>&1"
! SH_LOCK = RCSBINDIR + "rcs -l %(file)s </dev/null 2>&1"
! SH_CHECKIN = RCSBINDIR + "ci -u %(file)s <%(tfn)s 2>&1"
# Titles for various output pages (not subject to substitution)
--- 98,118 ----
# RCS commands
! import os
! if os.name in ['nt', ]:
! SH_RLOG = RCSBINDIR + "rlog %(file)s < NUL"
! SH_RLOG_H = RCSBINDIR + "rlog -h %(file)s < NUL"
! SH_RDIFF = RCSBINDIR + "rcsdiff -r%(prev)s -r%(rev)s %(file)s < NUL"
! SH_REVISION = RCSBINDIR + "co -p%(rev)s %(file)s < NUL"
! ### Have to use co -l, or the file is not marked rw on NT
! SH_LOCK = RCSBINDIR + "co -l %(file)s < NUL"
! SH_CHECKIN = RCSBINDIR + "ci -u %(file)s < %(tfn)s"
! else:
! SH_RLOG = RCSBINDIR + "rlog %(file)s </dev/null 2>&1"
! SH_RLOG_H = RCSBINDIR + "rlog -h %(file)s </dev/null 2>&1"
! SH_RDIFF = RCSBINDIR + "rcsdiff -r%(prev)s -r%(rev)s %(file)s </dev/null 2>&1"
! SH_REVISION = RCSBINDIR + "co -p%(rev)s %(file)s </dev/null 2>&1"
! SH_LOCK = RCSBINDIR + "rcs -l %(file)s </dev/null 2>&1"
! SH_CHECKIN = RCSBINDIR + "ci -u %(file)s <%(tfn)s 2>&1"
! del os
# Titles for various output pages (not subject to substitution)
***************
*** 532,536 ****
<H2>Can I use HTML in the FAQ entry?</H2>
! No, but if you include a URL or an email address in the text it will
automatigally become an anchor of the right type. Also, *word*
is made italic (but only for single alphabetic words).
--- 549,555 ----
<H2>Can I use HTML in the FAQ entry?</H2>
! Yes, if you include it in <HTML&rt; and </HTML> tags.
! <P>
! Also, if you include a URL or an email address in the text it will
automatigally become an anchor of the right type. Also, *word*
is made italic (but only for single alphabetic words).