[Netdevicelib-checkins] CVS: netdevicelib/src/netdevicelib connections.py,1.2,1.3

[<net...@li...>]

Update of /cvsroot/netdevicelib/netdevicelib/src/netdevicelib
In directory usw-pr-cvs1:/tmp/cvs-serv22191/src/netdevicelib

Modified Files:
	connections.py 
Log Message:
Bug #455566 - remove prompt from command output


Index: connections.py
===================================================================
RCS file: /cvsroot/netdevicelib/netdevicelib/src/netdevicelib/connections.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** connections.py	2001/08/09 02:53:26	1.2
--- connections.py	2001/08/26 19:49:27	1.3
***************
*** 11,15 ****
  
  from netdevicelib.devices import DeviceFactory
! import sys, telnetlib
  
  DEBUGGING=0
--- 11,15 ----
  
  from netdevicelib.devices import DeviceFactory
! import re, sys, telnetlib
  
  DEBUGGING=0
***************
*** 154,158 ****
          result = self._conn.expect( [ self._device.cmdPrompt() ],
                                      self._timeout )
!         return result[2]
                                     
  # ------------------------------------------------------------------------
--- 154,161 ----
          result = self._conn.expect( [ self._device.cmdPrompt() ],
                                      self._timeout )
! 
!         # Remove the prompt from the output and return the results
!         exp = re.compile( self._device.cmdPrompt() )
!         return exp.sub( '', result[2] )
                                     
  # ------------------------------------------------------------------------