[csw-devel] SF.net SVN: gar:[7644] csw/mgar/pkg/python/trunk

[wahwah at users.sourceforge.net]

Revision: 7644
          http://gar.svn.sourceforge.net/gar/?rev=7644&view=rev
Author:   wahwah
Date:     2009-12-17 10:19:41 +0000 (Thu, 17 Dec 2009)

Log Message:
-----------
python: Adding the patch from http://bugs.python.org/issue7208

Modified Paths:
--------------
    csw/mgar/pkg/python/trunk/Makefile
    csw/mgar/pkg/python/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/python/trunk/files/getpass.patch

Modified: csw/mgar/pkg/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/python/trunk/Makefile	2009-12-17 01:04:08 UTC (rev 7643)
+++ csw/mgar/pkg/python/trunk/Makefile	2009-12-17 10:19:41 UTC (rev 7644)
@@ -43,6 +43,7 @@
 PATCHFILES += site.diff
 PATCHFILES += python-config-in.diff
 PATCHFILES += setup.diff
+PATCHFILES += getpass.patch
 
 # Test for sunaudiodev fails.
 SKIPTEST = 1

Modified: csw/mgar/pkg/python/trunk/checksums
===================================================================
--- csw/mgar/pkg/python/trunk/checksums	2009-12-17 01:04:08 UTC (rev 7643)
+++ csw/mgar/pkg/python/trunk/checksums	2009-12-17 10:19:41 UTC (rev 7644)
@@ -1,5 +1,6 @@
 fee5408634a54e721a93531aba37f8c1  Python-2.6.4.tar.bz2
 42dd6523beb94a805d5764ae1276091c  faqwiz.diff
+88e213f865894051cdd8d3247502d612  getpass.patch
 5664b3970307d7d39d8d4061e7dccbb0  libpython2.5.so.1.0-isa-i386
 a87896c48b2f61b32053e6d02b07b022  libpython2.5.so.1.0-isa-sparcv8
 33f4094ee46ce865d3973a197f3fb4a0  makesetup.diff

Added: csw/mgar/pkg/python/trunk/files/getpass.patch
===================================================================
--- csw/mgar/pkg/python/trunk/files/getpass.patch	                        (rev 0)
+++ csw/mgar/pkg/python/trunk/files/getpass.patch	2009-12-17 10:19:41 UTC (rev 7644)
@@ -0,0 +1,30 @@
+--- release26-maint/Lib/getpass.py 2009/11/01 16:17:0676014
++++ release26-maint/Lib/getpass.py 2009/11/01 18:31:1376015
+@@ -62,12 +62,16 @@
+         try:
+             old = termios.tcgetattr(fd)     # a copy to save
+             new = old[:]
+-            new[3] &= ~termios.ECHO  # 3 == 'lflags'
++            new[3] &= ~(termios.ECHO|termios.ISIG)  # 3 == 'lflags'
++            tcsetattr_flags = termios.TCSAFLUSH
++            if hasattr(termios, 'TCSASOFT'):
++                tcsetattr_flags |= termios.TCSASOFT
+             try:
+-                termios.tcsetattr(fd, termios.TCSADRAIN, new)
++                termios.tcsetattr(fd, tcsetattr_flags, new)
+                 passwd = _raw_input(prompt, stream, input=input)
+             finally:
+-                termios.tcsetattr(fd, termios.TCSADRAIN, old)
++                termios.tcsetattr(fd, tcsetattr_flags, old)
++                stream.flush()  # issue7208
+         except termios.error, e:
+             if passwd is not None:
+                 # _raw_input succeeded.  The final tcsetattr failed.  Reraise
+@@ -125,6 +129,7 @@
+     if prompt:
+         stream.write(prompt)
+         stream.flush()
++    # NOTE: The Python C API calls flockfile() (and unlock) during readline.
+     line = input.readline()
+     if not line:
+         raise EOFError


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.