[Python-checkins] CVS: python/dist/src/Lib getpass.py,1.11,1.12 tty.py,1.3,1.4

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv15289

Modified Files:
	getpass.py tty.py 
Log Message:

Get the needed constants from termios, not TERMIOS.


Index: getpass.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/getpass.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** getpass.py	2001/01/20 23:34:12	1.11
--- getpass.py	2001/02/27 21:23:31	1.12
***************
*** 31,40 ****
      new = old[:]
  
!     new[3] = new[3] & ~TERMIOS.ECHO # 3 == 'lflags'
      try:
!         termios.tcsetattr(fd, TERMIOS.TCSADRAIN, new)
          passwd = _raw_input(prompt)
      finally:
!         termios.tcsetattr(fd, TERMIOS.TCSADRAIN, old)
  
      sys.stdout.write('\n')
--- 31,40 ----
      new = old[:]
  
!     new[3] = new[3] & ~termios.ECHO # 3 == 'lflags'
      try:
!         termios.tcsetattr(fd, termios.TCSADRAIN, new)
          passwd = _raw_input(prompt)
      finally:
!         termios.tcsetattr(fd, termios.TCSADRAIN, old)
  
      sys.stdout.write('\n')
***************
*** 104,108 ****
  # Bind the name getpass to the appropriate function
  try:
!     import termios, TERMIOS
  except ImportError:
      try:
--- 104,108 ----
  # Bind the name getpass to the appropriate function
  try:
!     import termios
  except ImportError:
      try:

Index: tty.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/tty.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** tty.py	2001/01/15 03:26:36	1.3
--- tty.py	2001/02/27 21:23:31	1.4
***************
*** 3,7 ****
  # Author: Steen Lumholt.
  
- from TERMIOS import *
  from termios import *
  
--- 3,6 ----