[Python-checkins] python/nondist/peps pep-html-template,1.2,1.3 pep2html.py,1.46,1.47

goodger@users.sourceforge.net goodger@users.sourceforge.net
Thu, 07 Nov 2002 19:43:50 -0800


Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv26830

Modified Files:
	pep-html-template pep2html.py 
Log Message:
Added "DO NOT EDIT" comment.  Updated from Docutils.

Index: pep-html-template
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-html-template,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pep-html-template	12 Sep 2002 02:30:51 -0000	1.2
--- pep-html-template	8 Nov 2002 03:43:48 -0000	1.3
***************
*** 1,8 ****
  <?xml version="1.0" encoding="%(encoding)s"?>
! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html lang="en">
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=%(encoding)s">
!   <meta name="generator" content="Docutils: http://docutils.sourceforge.net/">
    <title>PEP %(pep)s -- %(title)s</title>
    %(stylesheet)s</head>
--- 1,13 ----
  <?xml version="1.0" encoding="%(encoding)s"?>
! <!--
! This HTML is auto-generated.  DO NOT EDIT THIS FILE!  If you are writing a new
! PEP, see http://www.python.org/peps/pep-0001.html for instructions and links
! to templates.  DO NOT USE THIS HTML FILE AS YOUR TEMPLATE!
! -->
! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html lang="en">
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=%(encoding)s">
!   <meta name="generator" content="Docutils %(version)s: http://docutils.sourceforge.net/">
    <title>PEP %(pep)s -- %(title)s</title>
    %(stylesheet)s</head>

Index: pep2html.py
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep2html.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** pep2html.py	19 Oct 2002 01:33:12 -0000	1.46
--- pep2html.py	8 Nov 2002 03:43:48 -0000	1.47
***************
*** 55,58 ****
--- 55,64 ----
  LOCALVARS = "Local Variables:"
  
+ COMMENT = """<!--
+ This HTML is auto-generated.  DO NOT EDIT THIS FILE!  If you are writing a new
+ PEP, see http://www.python.org/peps/pep-0001.html for instructions and links
+ to templates.  DO NOT USE THIS HTML FILE AS YOUR TEMPLATE!
+ -->"""
+ 
  # The generated HTML doesn't validate -- you cannot use <hr> and <h3> inside
  # <pre> tags.  But if I change that, the result doesn't look very nice...
***************
*** 133,136 ****
--- 139,143 ----
      infile = iter(input_lines)
      # convert plaintext pep to minimal XHTML markup
+     print >> outfile, COMMENT
      print >> outfile, DTD
      print >> outfile, '<html>'
***************
*** 237,242 ****
              break
          if line[0].strip():
-             if line.strip() == LOCALVARS:
-                 break
              if not need_pre:
                  print >> outfile, '</pre>'
--- 244,247 ----
***************
*** 286,290 ****
  
  def fix_rst_pep(inpath, input_lines, outfile):
!     from docutils import core, io
      output = core.publish_string(
          source=''.join(input_lines),
--- 291,295 ----
  
  def fix_rst_pep(inpath, input_lines, outfile):
!     from docutils import core
      output = core.publish_string(
          source=''.join(input_lines),