[Python-checkins] python/dist/src/Tools/faqwiz faqconf.py, 1.24, 1.25

loewis at users.sourceforge.net loewis at users.sourceforge.net
Fri Oct 24 16:09:25 EDT 2003


Update of /cvsroot/python/python/dist/src/Tools/faqwiz
In directory sc8-pr-cvs1:/tmp/cvs-serv25282/Tools/faqwiz

Modified Files:
	faqconf.py 
Log Message:
Patch #812378: Normalize white space.


Index: faqconf.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/faqwiz/faqconf.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** faqconf.py	31 Mar 2000 00:55:54 -0000	1.24
--- faqconf.py	24 Oct 2003 20:09:23 -0000	1.25
***************
*** 16,33 ****
  # Parameters you definitely want to change
  
! SHORTNAME = "Generic"			# FAQ name with "FAQ" omitted
! PASSWORD = ""				# Password for editing
! OWNERNAME = "FAQ owner"			# Name for feedback
! OWNEREMAIL = "nobody at anywhere.org"	# Email for feedback
! HOMEURL = "http://www.python.org"	# Related home page
! HOMENAME = "Python home"		# Name of related home page
! RCSBINDIR = "/usr/local/bin/"		# Directory containing RCS commands
! 					# (must end in a slash)
  
  # Parameters you can normally leave alone
  
! MAXHITS = 10				# Max #hits to be shown directly
! COOKIE_LIFETIME = 28*24*3600		# Cookie expiration in seconds
! 					# (28*24*3600 = 28 days = 4 weeks)
  PROCESS_PREFORMAT = 1                   # toggle whether preformatted text
                                          # will replace urls and emails with 
--- 16,33 ----
  # Parameters you definitely want to change
  
! SHORTNAME = "Generic"                   # FAQ name with "FAQ" omitted
! PASSWORD = ""                           # Password for editing
! OWNERNAME = "FAQ owner"                 # Name for feedback
! OWNEREMAIL = "nobody at anywhere.org"      # Email for feedback
! HOMEURL = "http://www.python.org"       # Related home page
! HOMENAME = "Python home"                # Name of related home page
! RCSBINDIR = "/usr/local/bin/"           # Directory containing RCS commands
!                                         # (must end in a slash)
  
  # Parameters you can normally leave alone
  
! MAXHITS = 10                            # Max #hits to be shown directly
! COOKIE_LIFETIME = 28*24*3600            # Cookie expiration in seconds
!                                         # (28*24*3600 = 28 days = 4 weeks)
  PROCESS_PREFORMAT = 1                   # toggle whether preformatted text
                                          # will replace urls and emails with 
***************
*** 37,44 ****
  # (may contain HTML, e.g. <IMG>); and corresponding 
  
! MARK_VERY_RECENT = " **"		# Changed very recently
! MARK_RECENT = " *"			# Changed recently
! DT_VERY_RECENT = 24*3600		# 24 hours
! DT_RECENT = 7*24*3600			# 7 days
  
  EXPLAIN_MARKS = """
--- 37,44 ----
  # (may contain HTML, e.g. <IMG>); and corresponding 
  
! MARK_VERY_RECENT = " **"                # Changed very recently
! MARK_RECENT = " *"                      # Changed recently
! DT_VERY_RECENT = 24*3600                # 24 hours
! DT_RECENT = 7*24*3600                   # 7 days
  
  EXPLAIN_MARKS = """
***************
*** 50,54 ****
  # Version -- don't change unless you edit faqwiz.py
  
! WIZVERSION = "1.0.4"			# FAQ Wizard version
  
  import os, sys
--- 50,54 ----
  # Version -- don't change unless you edit faqwiz.py
  
! WIZVERSION = "1.0.4"                    # FAQ Wizard version
  
  import os, sys
***************
*** 56,65 ****
      # 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
--- 56,65 ----
      # 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
***************
*** 85,90 ****
  # Calculated parameter names
  
! COOKIE_NAME = SHORTNAME + "-FAQ-Wizard"	# Name used for Netscape cookie
! FAQNAME = SHORTNAME + " FAQ"		# Name of the FAQ
  
  # ----------------------------------------------------------------------
--- 85,90 ----
  # Calculated parameter names
  
! COOKIE_NAME = SHORTNAME + "-FAQ-Wizard" # Name used for Netscape cookie
! FAQNAME = SHORTNAME + " FAQ"            # Name of the FAQ
  
  # ----------------------------------------------------------------------
***************
*** 176,195 ****
      <INPUT TYPE=radio NAME=querytype VALUE=simple CHECKED>
          Simple string
! 	/
      <INPUT TYPE=radio NAME=querytype VALUE=regex>
          Regular expression
! 	/<BR>
      <INPUT TYPE=radio NAME=querytype VALUE=anykeywords>
          Keywords (any)
! 	/
      <INPUT TYPE=radio NAME=querytype VALUE=allkeywords>
          Keywords (all)
! 	<BR>
      <INPUT TYPE=radio NAME=casefold VALUE=yes CHECKED>
          Fold case
! 	/
      <INPUT TYPE=radio NAME=casefold VALUE=no>
          Case sensitive
! 	<BR>
      <INPUT TYPE=hidden NAME=req VALUE=search>
  </FORM>
--- 176,195 ----
      <INPUT TYPE=radio NAME=querytype VALUE=simple CHECKED>
          Simple string
!         /
      <INPUT TYPE=radio NAME=querytype VALUE=regex>
          Regular expression
!         /<BR>
      <INPUT TYPE=radio NAME=querytype VALUE=anykeywords>
          Keywords (any)
!         /
      <INPUT TYPE=radio NAME=querytype VALUE=allkeywords>
          Keywords (all)
!         <BR>
      <INPUT TYPE=radio NAME=casefold VALUE=yes CHECKED>
          Fold case
!         /
      <INPUT TYPE=radio NAME=casefold VALUE=no>
          Case sensitive
!         <BR>
      <INPUT TYPE=hidden NAME=req VALUE=search>
  </FORM>
***************
*** 363,374 ****
  <TABLE FRAME=none COLS=2>
      <TR>
! 	<TD>Name:
! 	<TD><INPUT TYPE=text SIZE=40 NAME=author VALUE="%(author)s">
      <TR>
! 	<TD>Email:
! 	<TD><INPUT TYPE=text SIZE=40 NAME=email VALUE="%(email)s">
      <TR>
! 	<TD>Password:
! 	<TD><INPUT TYPE=password SIZE=20 NAME=password VALUE="%(password)s">
  </TABLE>
  
--- 363,374 ----
  <TABLE FRAME=none COLS=2>
      <TR>
!         <TD>Name:
!         <TD><INPUT TYPE=text SIZE=40 NAME=author VALUE="%(author)s">
      <TR>
!         <TD>Email:
!         <TD><INPUT TYPE=text SIZE=40 NAME=email VALUE="%(email)s">
      <TR>
!         <TD>Password:
!         <TD><INPUT TYPE=password SIZE=20 NAME=password VALUE="%(password)s">
  </TABLE>
  





More information about the Python-checkins mailing list