[Docstring-checkins] CVS: dps/dps/readers __init__.py,1.2,1.3

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

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

Modified Files:
	__init__.py 
Log Message:
rearranged logic

Index: __init__.py
===================================================================
RCS file: /cvsroot/docstring/dps/dps/readers/__init__.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** __init__.py	7 Feb 2002 01:59:51 -0000	1.2
--- __init__.py	12 Feb 2002 02:19:27 -0000	1.3
***************
*** 60,76 ****
          self.source = source
          self.parser = parser
!         self.scan(self.source)          # may modify self.parser,
!                                         # depending on input
!         self.parse(self.parser)
          self.transform()
          return self.document
  
!     def scan(self, source):
!         """Override to read `self.input` from `source`."""
          raise NotImplementedError('subclass must override this method')
  
      def scanfile(self, source):
          """
!         Scan a single file, store data in `self.input`.
  
          Parameter `source` may be:
--- 60,75 ----
          self.source = source
          self.parser = parser
!         self.scan()               # may modify self.parser, depending on input
!         self.parse()
          self.transform()
          return self.document
  
!     def scan(self):
!         """Override to read `self.input` from `self.source`."""
          raise NotImplementedError('subclass must override this method')
  
      def scanfile(self, source):
          """
!         Scan a single file and return the raw data.
  
          Parameter `source` may be:
***************
*** 81,94 ****
          """
          if hasattr(source, 'read'):
!             self.input = source.read()
!         elif self.source:
!             self.input = open(source).read()
!         else:
!             self.input = sys.stdin.read()
  
!     def parse(self, parser):
          """Parse `self.input` into a document tree."""
          self.document = self.newdocument()
!         parser.parse(self.input, self.document)
  
      def transform(self):
--- 80,92 ----
          """
          if hasattr(source, 'read'):
!             return source.read()
!         if self.source:
!             return open(source).read()
!         return sys.stdin.read()
  
!     def parse(self):
          """Parse `self.input` into a document tree."""
          self.document = self.newdocument()
!         self.parser.parse(self.input, self.document)
  
      def transform(self):