mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 13:41:24 +00:00 
			
		
		
		
	 360e4b8fb1
			
		
	
	
		360e4b8fb1
		
	
	
	
	
		
			
			svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
  r55326 | guido.van.rossum | 2007-05-14 15:07:35 -0700 (Mon, 14 May 2007) | 2 lines
  Don't use err.message, use err.args[0].
................
  r55327 | guido.van.rossum | 2007-05-14 15:11:37 -0700 (Mon, 14 May 2007) | 259 lines
  Merged revisions 54988-55226,55228-55323 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk
  ........
    r54995 | neal.norwitz | 2007-04-26 23:45:32 -0700 (Thu, 26 Apr 2007) | 3 lines
    This gets the test working on Solaris.  It seems a little hokey to me,
    but the test passed on Linux and Solaris, hopefully other platforms too.
  ........
    r55002 | georg.brandl | 2007-04-27 12:20:00 -0700 (Fri, 27 Apr 2007) | 2 lines
    Version fix (bug #1708710)
  ........
    r55021 | neal.norwitz | 2007-04-29 16:53:24 -0700 (Sun, 29 Apr 2007) | 1 line
    There really are some tests that are problematic.
  ........
    r55024 | kristjan.jonsson | 2007-04-30 08:17:46 -0700 (Mon, 30 Apr 2007) | 1 line
    Complete revamp of PCBuild8 directory.  Use subdirectories for each project under the main pcbuild solution.  Now make extensive use of property sheets to simplify project configuration. x64 build fully supported, and the process for building PGO version (Profiler Guided Optimization) simplified. All projects are now present, except _ssl, which needs to be reimplemented.  Also, some of the projects that require external libraries need extra work to fully compile on x64.
  ........
    r55025 | thomas.heller | 2007-04-30 08:44:17 -0700 (Mon, 30 Apr 2007) | 4 lines
    Make sure to call PyErr_NoMemory() in several places where
    PyMem_Malloc() could potentially fail.
    Will backport to the release25-maint branch.
  ........
    r55027 | thomas.heller | 2007-04-30 09:04:57 -0700 (Mon, 30 Apr 2007) | 8 lines
    When accessing the .value attribute of a c_wchar_p instance, and the
    instance does not point to a valid wchar_t zero-terminated string,
    raise a ValueError.  c_char_p does this already.
    The ValueError message now contains the correct pointer address.
    Will backport to release25-maint.
  ........
    r55036 | georg.brandl | 2007-04-30 23:04:11 -0700 (Mon, 30 Apr 2007) | 2 lines
    Bug #1710295: exceptions are now new-style classes.
  ........
    r55038 | georg.brandl | 2007-04-30 23:08:15 -0700 (Mon, 30 Apr 2007) | 2 lines
    Patch #1710352: add missing public functions to locale.__all__.
  ........
    r55041 | vinay.sajip | 2007-05-01 03:20:03 -0700 (Tue, 01 May 2007) | 1 line
    Added new optional credentials argument to SMTPHandler.__init__, and smtp.login() is now called in SMTPHandler.emit() if credentials are specified.
  ........
    r55042 | vinay.sajip | 2007-05-01 03:21:45 -0700 (Tue, 01 May 2007) | 1 line
    Added documentation for new optional credentials argument to SMTPHandler.__init__().
  ........
    r55070 | neal.norwitz | 2007-05-01 21:47:55 -0700 (Tue, 01 May 2007) | 3 lines
    Stop using PyMem_FREE while the GIL is not held.  For details see:
    http://mail.python.org/pipermail/python-dev/2007-May/072896.html
  ........
    r55080 | armin.rigo | 2007-05-02 12:23:31 -0700 (Wed, 02 May 2007) | 6 lines
    Fix for #1303614 and #1174712:
    - __dict__ descriptor abuse for subclasses of built-in types
    - subclassing from both ModuleType and another built-in types
    Thanks zseil for the patch.
  ........
    r55083 | georg.brandl | 2007-05-02 13:02:29 -0700 (Wed, 02 May 2007) | 3 lines
    Actually raise an exception before calling ast_error_finish.
    Triggers an assertion otherwise.
  ........
    r55087 | neal.norwitz | 2007-05-02 23:47:18 -0700 (Wed, 02 May 2007) | 1 line
    Handle a couple of uncaught errors.  This should be backported
  ........
    r55090 | neal.norwitz | 2007-05-03 00:20:57 -0700 (Thu, 03 May 2007) | 4 lines
    Remove dead code.  This code couldn't be reached because earlier in
    the function there is another check for z != Py_None.
  ........
    r55092 | thomas.heller | 2007-05-03 05:02:08 -0700 (Thu, 03 May 2007) | 1 line
    Fix building _ctypes.pyd for x64 / Windows.
  ........
    r55093 | thomas.heller | 2007-05-03 05:05:20 -0700 (Thu, 03 May 2007) | 1 line
    Don't truncate pointers to integers (on win64 platform).
  ........
    r55094 | walter.doerwald | 2007-05-03 08:13:55 -0700 (Thu, 03 May 2007) | 3 lines
    Clarify the behaviour of PyUnicode_DecodeUTF16(): A BOM is only skipped
    in native order mode, and only if it's the first two bytes.
  ........
    r55101 | kristjan.jonsson | 2007-05-03 13:04:53 -0700 (Thu, 03 May 2007) | 2 lines
    Fix pcbuild8 after recent overhaul:  Added the version resource to python26.dll. Adjust stacksize to 2Mb and made large address aware for 32 bits, and set stacksize to 3Mb for 64 bits.
    Todo:  Set .dll optimized load addresses, and side-by-side packaging of the python26.dll.
  ........
    r55102 | kristjan.jonsson | 2007-05-03 13:09:56 -0700 (Thu, 03 May 2007) | 1 line
    Fix those parts in the testsuite that assumed that sys.maxint would cause overflow on x64.  Now the testsuite is well behaved on that platform.
  ........
    r55103 | kristjan.jonsson | 2007-05-03 13:27:03 -0700 (Thu, 03 May 2007) | 11 lines
    Fix problems in x64 build that were discovered by the testsuite:
    - Reenable modules on x64 that had been disabled aeons ago for Itanium.
    - Cleared up confusion about compilers for 64 bit windows.  There is only Itanium and x64.  Added macros MS_WINI64 and MS_WINX64 for those rare cases where it matters, such as the disabling of modules above.
    - Set target platform (_WIN32_WINNT and WINVER) to 0x0501 (XP) for x64, and 0x0400 (NT 4.0) otherwise, which are the targeted minimum platforms.
    - Fixed thread_nt.h.  The emulated InterlockedCompareExchange function didn?\194?\180t work on x64, probaby due to the lack of a "volatile" specifier.  Anyway, win95 is no longer a target platform.
    - Itertools module used wrong constant to check for overflow in count()
    - PyInt_AsSsize_t couldn't deal with attribute error when accessing the __long__ member.
    - PyLong_FromSsize_t() incorrectly specified that the operand were unsigned.
    With these changes, the x64 passes the testsuite, for those modules present.
  ........
    r55107 | kristjan.jonsson | 2007-05-03 17:25:08 -0700 (Thu, 03 May 2007) | 1 line
    Revert compiler comment to AMD64 for x64/AMD64 builds.
  ........
    r55115 | thomas.heller | 2007-05-04 00:14:39 -0700 (Fri, 04 May 2007) | 4 lines
    Fix some ctypes test crashes, when running with a debug Python
    version on win64 by using proper argtypes and restype function
    attributes.
  ........
    r55117 | thomas.heller | 2007-05-04 01:20:41 -0700 (Fri, 04 May 2007) | 4 lines
    On 64-bit Windows, ffi_arg must be 8 bytes long.  This fixes the
    remaining crashes in the ctypes tests, when functions return float or
    double types.
  ........
    r55120 | kristjan.jonsson | 2007-05-04 08:48:15 -0700 (Fri, 04 May 2007) | 1 line
    Update the pcbuild8 solution.  Straightened out the _ctypes project by using a .vsproj file and a masm64.rules file to avoid redundancy
  ........
    r55121 | kristjan.jonsson | 2007-05-04 10:28:06 -0700 (Fri, 04 May 2007) | 1 line
    Minor fix of PCBuild8/_ctypes vcproj, moving include dir into the .vsprops file.
  ........
    r55129 | thomas.heller | 2007-05-04 12:54:22 -0700 (Fri, 04 May 2007) | 3 lines
    Do not truncate 64-bit pointers to 32-bit integers.
    Fixes SF #1703286, will backport to release25-maint.
  ........
    r55131 | thomas.heller | 2007-05-04 12:56:32 -0700 (Fri, 04 May 2007) | 1 line
    Oops, these tests do not run on Windows CE.
  ........
    r55140 | brett.cannon | 2007-05-04 18:34:02 -0700 (Fri, 04 May 2007) | 2 lines
    Deprecate BaseException.message as per PEP 352.
  ........
    r55154 | georg.brandl | 2007-05-05 11:55:37 -0700 (Sat, 05 May 2007) | 2 lines
    Bug #1713535: typo in logging example.
  ........
    r55158 | vinay.sajip | 2007-05-06 10:53:37 -0700 (Sun, 06 May 2007) | 1 line
    Updates of recent changes to logging.
  ........
    r55165 | neal.norwitz | 2007-05-07 00:02:26 -0700 (Mon, 07 May 2007) | 1 line
    Verify changes to the trunk go to the normal checkins list
  ........
    r55169 | kristjan.jonsson | 2007-05-07 09:46:54 -0700 (Mon, 07 May 2007) | 1 line
    As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol.  The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present.
  ........
    r55197 | collin.winter | 2007-05-08 21:14:36 -0700 (Tue, 08 May 2007) | 9 lines
    Fix a bug in test.test_support.open_urlresource().
    If the call to requires() doesn't precede the filesystem check, we get the following situation:
    1. ./python Lib/test/regrtest.py test_foo # test needs urlfetch, not enabled, so skipped
    2. ./python Lib/test/regrtest.py -u urlfetch test_foo # test runs
    3. ./python Lib/test/regrtest.py test_foo # test runs (!)
    By moving the call to requires() *before* the filesystem check, the fact that fetched files are cached on the local disk becomes an implementation detail, rather than a semantics-changing point of note.
  ........
    r55198 | neal.norwitz | 2007-05-08 23:43:15 -0700 (Tue, 08 May 2007) | 1 line
    Add markup for True/False.  Will backport
  ........
    r55205 | walter.doerwald | 2007-05-09 11:10:47 -0700 (Wed, 09 May 2007) | 4 lines
    Backport checkin:
    Fix a segfault when b"" was passed to b2a_qp() -- it was using strchr()
    instead of memchr().
  ........
    r55241 | neal.norwitz | 2007-05-10 22:55:15 -0700 (Thu, 10 May 2007) | 6 lines
    Don't ever report a failure when the sum of the reference count differences
    are zero.  This should help reduce the false positives.
    The message about references leaking is maintained to provide as much
    info as possible rather than simply suppressing the message at the source.
  ........
    r55242 | neal.norwitz | 2007-05-10 23:23:01 -0700 (Thu, 10 May 2007) | 1 line
    Fix typo in docstring (the module is popen2, not 3).
  ........
    r55244 | neal.norwitz | 2007-05-10 23:56:52 -0700 (Thu, 10 May 2007) | 1 line
    Remove trailing whitespace in docstring
  ........
    r55245 | neal.norwitz | 2007-05-10 23:57:33 -0700 (Thu, 10 May 2007) | 1 line
    Deprecate os.popen* and popen2 module in favor of the subprocess module.
  ........
    r55247 | neal.norwitz | 2007-05-11 00:13:30 -0700 (Fri, 11 May 2007) | 1 line
    Deprecate os.popen* and popen2 module in favor of the subprocess module. (forgot the doc)
  ........
    r55253 | georg.brandl | 2007-05-11 02:41:37 -0700 (Fri, 11 May 2007) | 3 lines
    Remove an XXX that is unnecessary.
  ........
    r55258 | georg.brandl | 2007-05-11 04:04:26 -0700 (Fri, 11 May 2007) | 2 lines
    Patch #1714700: clarify os.linesep vs. tfiles opened in text mode.
     (backport)
  ........
    r55259 | georg.brandl | 2007-05-11 04:43:56 -0700 (Fri, 11 May 2007) | 2 lines
    Update DDJ link.
  ........
    r55273 | raymond.hettinger | 2007-05-11 10:59:59 -0700 (Fri, 11 May 2007) | 1 line
    Better tests for posixpath.commonprefix
  ........
    r55287 | georg.brandl | 2007-05-12 14:06:41 -0700 (Sat, 12 May 2007) | 2 lines
    Bug #1046945: document SWIG options of distutils.
  ........
    r55290 | georg.brandl | 2007-05-13 01:04:07 -0700 (Sun, 13 May 2007) | 2 lines
    Add bz2 to content encodings.
  ........
    r55297 | neal.norwitz | 2007-05-13 13:45:05 -0700 (Sun, 13 May 2007) | 3 lines
    Remove Amoeba doc which was removed in version 1.0! according to Misc/HISTORY.
    Hopefully Guido won't shed a tear. :-)
  ........
    r55298 | neal.norwitz | 2007-05-13 13:54:19 -0700 (Sun, 13 May 2007) | 1 line
    Remove references to stdwin which was removed long ago.
  ........
    r55299 | neal.norwitz | 2007-05-13 14:13:42 -0700 (Sun, 13 May 2007) | 3 lines
    Remove support for freebsd[23] which haven't been released since 2000
    or earlier.  http://www.freebsd.org/releases/index.html
  ........
    r55320 | raymond.hettinger | 2007-05-14 13:52:31 -0700 (Mon, 14 May 2007) | 1 line
    Small speedup.
  ........
................
		
	
			
		
			
				
	
	
		
			196 lines
		
	
	
	
		
			7.3 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			196 lines
		
	
	
	
		
			7.3 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| import errno
 | |
| import fcntl
 | |
| import pty
 | |
| import os
 | |
| import sys
 | |
| import signal
 | |
| from test.test_support import verbose, TestSkipped, run_unittest
 | |
| import unittest
 | |
| 
 | |
| TEST_STRING_1 = "I wish to buy a fish license.\n"
 | |
| TEST_STRING_2 = "For my pet fish, Eric.\n"
 | |
| 
 | |
| if verbose:
 | |
|     def debug(msg):
 | |
|         print(msg)
 | |
| else:
 | |
|     def debug(msg):
 | |
|         pass
 | |
| 
 | |
| 
 | |
| def normalize_output(data):
 | |
|     # Some operating systems do conversions on newline.  We could possibly
 | |
|     # fix that by doing the appropriate termios.tcsetattr()s.  I couldn't
 | |
|     # figure out the right combo on Tru64 and I don't have an IRIX box.
 | |
|     # So just normalize the output and doc the problem O/Ses by allowing
 | |
|     # certain combinations for some platforms, but avoid allowing other
 | |
|     # differences (like extra whitespace, trailing garbage, etc.)
 | |
| 
 | |
|     # This is about the best we can do without getting some feedback
 | |
|     # from someone more knowledgable.
 | |
| 
 | |
|     # OSF/1 (Tru64) apparently turns \n into \r\r\n.
 | |
|     if data.endswith('\r\r\n'):
 | |
|         return data.replace('\r\r\n', '\n')
 | |
| 
 | |
|     # IRIX apparently turns \n into \r\n.
 | |
|     if data.endswith('\r\n'):
 | |
|         return data.replace('\r\n', '\n')
 | |
| 
 | |
|     return data
 | |
| 
 | |
| 
 | |
| # Marginal testing of pty suite. Cannot do extensive 'do or fail' testing
 | |
| # because pty code is not too portable.
 | |
| # XXX(nnorwitz):  these tests leak fds when there is an error.
 | |
| class PtyTest(unittest.TestCase):
 | |
|     def setUp(self):
 | |
|         # isatty() and close() can hang on some platforms.  Set an alarm
 | |
|         # before running the test to make sure we don't hang forever.
 | |
|         self.old_alarm = signal.signal(signal.SIGALRM, self.handle_sig)
 | |
|         signal.alarm(10)
 | |
| 
 | |
|     def tearDown(self):
 | |
|         # remove alarm, restore old alarm handler
 | |
|         signal.alarm(0)
 | |
|         signal.signal(signal.SIGALRM, self.old_alarm)
 | |
| 
 | |
|     def handle_sig(self, sig, frame):
 | |
|         self.fail("isatty hung")
 | |
| 
 | |
|     def test_basic(self):
 | |
|         try:
 | |
|             debug("Calling master_open()")
 | |
|             master_fd, slave_name = pty.master_open()
 | |
|             debug("Got master_fd '%d', slave_name '%s'" %
 | |
|                   (master_fd, slave_name))
 | |
|             debug("Calling slave_open(%r)" % (slave_name,))
 | |
|             slave_fd = pty.slave_open(slave_name)
 | |
|             debug("Got slave_fd '%d'" % slave_fd)
 | |
|         except OSError:
 | |
|             # " An optional feature could not be imported " ... ?
 | |
|             raise TestSkipped, "Pseudo-terminals (seemingly) not functional."
 | |
| 
 | |
|         self.assertTrue(os.isatty(slave_fd), 'slave_fd is not a tty')
 | |
| 
 | |
|         # Solaris requires reading the fd before anything is returned.
 | |
|         # My guess is that since we open and close the slave fd
 | |
|         # in master_open(), we need to read the EOF.
 | |
| 
 | |
|         # Ensure the fd is non-blocking in case there's nothing to read.
 | |
|         orig_flags = fcntl.fcntl(master_fd, fcntl.F_GETFL)
 | |
|         fcntl.fcntl(master_fd, fcntl.F_SETFL, orig_flags | os.O_NONBLOCK)
 | |
|         try:
 | |
|             s1 = os.read(master_fd, 1024)
 | |
|             self.assertEquals('', s1)
 | |
|         except OSError as e:
 | |
|             if e.errno != errno.EAGAIN:
 | |
|                 raise
 | |
|         # Restore the original flags.
 | |
|         fcntl.fcntl(master_fd, fcntl.F_SETFL, orig_flags)
 | |
| 
 | |
|         debug("Writing to slave_fd")
 | |
|         os.write(slave_fd, TEST_STRING_1)
 | |
|         s1 = os.read(master_fd, 1024)
 | |
|         self.assertEquals('I wish to buy a fish license.\n',
 | |
|                           normalize_output(s1))
 | |
| 
 | |
|         debug("Writing chunked output")
 | |
|         os.write(slave_fd, TEST_STRING_2[:5])
 | |
|         os.write(slave_fd, TEST_STRING_2[5:])
 | |
|         s2 = os.read(master_fd, 1024)
 | |
|         self.assertEquals('For my pet fish, Eric.\n', normalize_output(s2))
 | |
| 
 | |
|         os.close(slave_fd)
 | |
|         os.close(master_fd)
 | |
| 
 | |
| 
 | |
|     def test_fork(self):
 | |
|         debug("calling pty.fork()")
 | |
|         pid, master_fd = pty.fork()
 | |
|         if pid == pty.CHILD:
 | |
|             # stdout should be connected to a tty.
 | |
|             if not os.isatty(1):
 | |
|                 debug("Child's fd 1 is not a tty?!")
 | |
|                 os._exit(3)
 | |
| 
 | |
|             # After pty.fork(), the child should already be a session leader.
 | |
|             # (on those systems that have that concept.)
 | |
|             debug("In child, calling os.setsid()")
 | |
|             try:
 | |
|                 os.setsid()
 | |
|             except OSError:
 | |
|                 # Good, we already were session leader
 | |
|                 debug("Good: OSError was raised.")
 | |
|                 pass
 | |
|             except AttributeError:
 | |
|                 # Have pty, but not setsid()?
 | |
|                 debug("No setsid() available?")
 | |
|                 pass
 | |
|             except:
 | |
|                 # We don't want this error to propagate, escaping the call to
 | |
|                 # os._exit() and causing very peculiar behavior in the calling
 | |
|                 # regrtest.py !
 | |
|                 # Note: could add traceback printing here.
 | |
|                 debug("An unexpected error was raised.")
 | |
|                 os._exit(1)
 | |
|             else:
 | |
|                 debug("os.setsid() succeeded! (bad!)")
 | |
|                 os._exit(2)
 | |
|             os._exit(4)
 | |
|         else:
 | |
|             debug("Waiting for child (%d) to finish." % pid)
 | |
|             # In verbose mode, we have to consume the debug output from the
 | |
|             # child or the child will block, causing this test to hang in the
 | |
|             # parent's waitpid() call.  The child blocks after a
 | |
|             # platform-dependent amount of data is written to its fd.  On
 | |
|             # Linux 2.6, it's 4000 bytes and the child won't block, but on OS
 | |
|             # X even the small writes in the child above will block it.  Also
 | |
|             # on Linux, the read() will throw an OSError (input/output error)
 | |
|             # when it tries to read past the end of the buffer but the child's
 | |
|             # already exited, so catch and discard those exceptions.  It's not
 | |
|             # worth checking for EIO.
 | |
|             while True:
 | |
|                 try:
 | |
|                     data = os.read(master_fd, 80)
 | |
|                 except OSError:
 | |
|                     break
 | |
|                 if not data:
 | |
|                     break
 | |
|                 sys.stdout.write(data.replace('\r\n', '\n'))
 | |
| 
 | |
|             ##line = os.read(master_fd, 80)
 | |
|             ##lines = line.replace('\r\n', '\n').split('\n')
 | |
|             ##if False and lines != ['In child, calling os.setsid()',
 | |
|             ##             'Good: OSError was raised.', '']:
 | |
|             ##    raise TestFailed("Unexpected output from child: %r" % line)
 | |
| 
 | |
|             (pid, status) = os.waitpid(pid, 0)
 | |
|             res = status >> 8
 | |
|             debug("Child (%d) exited with status %d (%d)." % (pid, res, status))
 | |
|             if res == 1:
 | |
|                 self.fail("Child raised an unexpected exception in os.setsid()")
 | |
|             elif res == 2:
 | |
|                 self.fail("pty.fork() failed to make child a session leader.")
 | |
|             elif res == 3:
 | |
|                 self.fail("Child spawned by pty.fork() did not have a tty as stdout")
 | |
|             elif res != 4:
 | |
|                 self.fail("pty.fork() failed for unknown reasons.")
 | |
| 
 | |
|             ##debug("Reading from master_fd now that the child has exited")
 | |
|             ##try:
 | |
|             ##    s1 = os.read(master_fd, 1024)
 | |
|             ##except os.error:
 | |
|             ##    pass
 | |
|             ##else:
 | |
|             ##    raise TestFailed("Read from master_fd did not raise exception")
 | |
| 
 | |
|         os.close(master_fd)
 | |
| 
 | |
|         # pty.fork() passed.
 | |
| 
 | |
| def test_main(verbose=None):
 | |
|     run_unittest(PtyTest)
 | |
| 
 | |
| if __name__ == "__main__":
 | |
|     test_main()
 |