[Docstring-checkins] CVS: dps/dps statemachine.py,1.4,1.5

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

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

Modified Files:
	statemachine.py 
Log Message:
  - Removed startoffset parameter from StateMachineWS.getindented(),
    undoing yesterday's bad fix.

Index: statemachine.py
===================================================================
RCS file: /cvsroot/docstring/dps/dps/statemachine.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** statemachine.py	2001/08/22 04:08:22	1.4
--- statemachine.py	2001/08/23 03:59:03	1.5
***************
*** 3,7 ****
  """
  :Author: David Goodger
! :Contact: dgo...@bi...
  :Version: 1.3
  :Revision: $Revision$
--- 3,7 ----
  """
  :Author: David Goodger
! :Contact: go...@us...
  :Version: 1.3
  :Revision: $Revision$
***************
*** 294,298 ****
                  break
              if line[0] == ' ':
!                 self.nextline(len(block) - 1)
                  raise UnexpectedIndentationError(block, self.abslineno() + 1)
              block.append(line)
--- 294,298 ----
                  break
              if line[0] == ' ':
!                 self.nextline(len(block) - 1) # advance to last line of block
                  raise UnexpectedIndentationError(block, self.abslineno() + 1)
              block.append(line)
***************
*** 684,688 ****
              return context, '', []      # neither blank line nor indented
  
!     def getindented(self, startoffset=0):
          """
          Return an indented block and info.
--- 684,688 ----
              return context, '', []      # neither blank line nor indented
  
!     def getindented(self):
          """
          Return an indented block and info.
***************
*** 696,705 ****
          - whether or not it finished with a blank line.
          """
!         offset = self.abslineoffset() + startoffset
          indented, indent, blankfinish = extractindented(
!               self.inputlines[self.lineoffset + startoffset:])
          if indented:
!             # advance to last indented line
!             self.nextline(len(indented) - 1 + startoffset)
          while indented and not indented[-1].strip():
              indented.pop()
--- 696,704 ----
          - whether or not it finished with a blank line.
          """
!         offset = self.abslineoffset()
          indented, indent, blankfinish = extractindented(
!               self.inputlines[self.lineoffset:])
          if indented:
!             self.nextline(len(indented) - 1) # advance to last indented line
          while indented and not indented[-1].strip():
              indented.pop()