[Python-checkins] python/nondist/peps/docutils/readers __init__.py,1.1,1.2 pep.py,1.1,1.2 .cvsignore,1.1,NONE

goodger@users.sourceforge.net goodger@users.sourceforge.net
Tue, 31 Dec 2002 18:36:02 -0800


Update of /cvsroot/python/python/nondist/peps/docutils/readers
In directory sc8-pr-cvs1:/tmp/cvs-serv30174/readers

Modified Files:
	__init__.py pep.py 
Removed Files:
	.cvsignore 
Log Message:
update from latest Docutils code

Index: __init__.py
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/docutils/readers/__init__.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** __init__.py	8 Nov 2002 23:47:52 -0000	1.1
--- __init__.py	1 Jan 2003 02:36:00 -0000	1.2
***************
*** 62,67 ****
              self.parser = parser
          self.settings = settings
!         # May modify self.parser, depending on input:
!         self.input = self.source.read(self)
          self.parse()
          return self.document
--- 62,66 ----
              self.parser = parser
          self.settings = settings
!         self.input = self.source.read()
          self.parse()
          return self.document

Index: pep.py
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/docutils/readers/pep.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pep.py	8 Nov 2002 23:47:52 -0000	1.1
--- pep.py	1 Jan 2003 02:36:00 -0000	1.2
***************
*** 21,24 ****
--- 21,33 ----
  
  
+ class Inliner(rst.states.Inliner):
+ 
+     """
+     Extend `rst.Inliner` to for local PEP references.
+     """
+ 
+     pep_url = rst.states.Inliner.pep_url_local
+ 
+ 
  class Reader(standalone.Reader):
  
***************
*** 45,60 ****
      settings_default_overrides = {'pep_references': 1, 'rfc_references': 1}
  
      def __init__(self, parser=None, parser_name=None):
          """`parser` should be ``None``."""
          if parser is None:
!             parser = rst.Parser(rfc2822=1, inliner=Inliner())
          standalone.Reader.__init__(self, parser, '')
- 
- 
- class Inliner(rst.states.Inliner):
- 
-     """
-     Extend `rst.Inliner` to for local PEP references.
-     """
- 
-     pep_url = rst.states.Inliner.pep_url_local
--- 54,62 ----
      settings_default_overrides = {'pep_references': 1, 'rfc_references': 1}
  
+     inliner_class = Inliner
+ 
      def __init__(self, parser=None, parser_name=None):
          """`parser` should be ``None``."""
          if parser is None:
!             parser = rst.Parser(rfc2822=1, inliner=self.inliner_class())
          standalone.Reader.__init__(self, parser, '')

--- .cvsignore DELETED ---