[Docstring-checkins] CVS: dps/dps core.py,1.1,1.2

[David G. <go...@us...>]

Update of /cvsroot/docstring/dps/dps
In directory usw-pr-cvs1:/tmp/cvs-serv9734/dps/dps

Modified Files:
	core.py 
Log Message:
Moved the ``Reporter`` instantiation even higher, up to the top of the chain.

Index: core.py
===================================================================
RCS file: /cvsroot/docstring/dps/dps/core.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** core.py	2002/02/06 03:02:51	1.1
--- core.py	2002/02/07 02:02:24	1.2
***************
*** 11,35 ****
  """
  
! __docformat = 'reStructuredText'
  
! __all__ = ['Publisher', 'setup']
  
  
! from dps import readers, parsers, writers
  
  
  class Publisher:
  
!     def __init__(self, reader=None, parser=None, writer=None):
          self.reader = reader
          self.parser = parser
          self.writer = writer
  
!     def setreader(self, readername, languagecode='en', warninglevel=2,
!                   errorlevel=4, warningstream=None, debug=0):
          """Set `self.reader` by name."""
          readerclass = readers.get_reader_class(readername)
!         self.reader = readerclass(languagecode, warninglevel, errorlevel,
!                                   warningstream, debug)
  
      def setparser(self, parsername):
--- 11,44 ----
  """
  
! __docformat__ = 'reStructuredText'
  
! __all__ = ['Publisher', 'publish']
  
  
! import readers, parsers, writers, utils
  
  
  class Publisher:
  
!     reporter = None
!     """A `utils.Reporter` instance used for all document processing."""
! 
!     def __init__(self, reader=None, parser=None, writer=None, reporter=None,
!                  languagecode='en', warninglevel=2, errorlevel=4,
!                  warningstream=None, debug=0):
          self.reader = reader
          self.parser = parser
          self.writer = writer
+         if not reporter:
+             reporter = utils.Reporter(warninglevel, errorlevel, warningstream,
+                                       debug)
+         self.reporter = reporter
+         self.languagecode = languagecode
  
!     def setreader(self, readername, languagecode=None):
          """Set `self.reader` by name."""
          readerclass = readers.get_reader_class(readername)
!         self.reader = readerclass(self.reporter,
!                                   languagecode or self.languagecode)
  
      def setparser(self, parsername):
***************
*** 48,56 ****
  
  
! def convert(source=None, destination=None,
              reader=None, readername='standalone',
              parser=None, parsername='restructuredtext',
!             writer=None, writername='pprint'):
!     pub = Publisher(reader, parser, writer)
      if reader is None:
          pub.setreader(readername)
--- 57,68 ----
  
  
! def publish(source=None, destination=None,
              reader=None, readername='standalone',
              parser=None, parsername='restructuredtext',
!             writer=None, writername='pprint',
!             reporter=None, languagecode='en',
!             warninglevel=2, errorlevel=4, warningstream=None, debug=0):
!     pub = Publisher(reader, parser, writer, reporter, languagecode,
!                     warninglevel, errorlevel, warningstream, debug)
      if reader is None:
          pub.setreader(readername)