• Guido van Rossum's avatar
    Merged revisions 53952-54987 via svnmerge from · d8faa365
    Guido van Rossum yazdı
    svn+ssh://pythondev@svn.python.org/python/trunk
    
    ........
      r53954 | jeremy.hylton | 2007-02-26 10:41:18 -0800 (Mon, 26 Feb 2007) | 10 lines
    
      Do not copy free variables to locals in class namespaces.
    
      Fixes bug 1569356, but at the cost of a minor incompatibility in
      locals().  Add test that verifies that the class namespace is not
      polluted.  Also clarify the behavior in the library docs.
    
      Along the way, cleaned up the dict_to_map and map_to_dict
      implementations and added some comments that explain what they do.
    ........
      r53955 | jeremy.hylton | 2007-02-26 11:00:20 -0800 (Mon, 26 Feb 2007) | 2 lines
    
      Fix assertion.
    ........
      r53969 | neal.norwitz | 2007-02-26 14:41:45 -0800 (Mon, 26 Feb 2007) | 3 lines
    
      When printing an unraisable error, don't print exceptions. before the name.
      This duplicates the behavior whening normally printing exceptions.
    ........
      r53970 | andrew.kuchling | 2007-02-26 15:02:47 -0800 (Mon, 26 Feb 2007) | 1 line
    
      Markup fix
    ........
      r53975 | neal.norwitz | 2007-02-26 15:48:27 -0800 (Mon, 26 Feb 2007) | 3 lines
    
      SF #1669182, 2.5 was already fixed.  Just assert in 2.6 since string exceptions
      are gone.
    ........
      r53976 | andrew.kuchling | 2007-02-26 15:54:17 -0800 (Mon, 26 Feb 2007) | 1 line
    
      Add some items
    ........
      r53981 | jeremy.hylton | 2007-02-26 17:01:59 -0800 (Mon, 26 Feb 2007) | 4 lines
    
      Fix long-standing bug in name mangling for package imports
    
      Reported by Mike Verdone.
    ........
      r53993 | jeremy.hylton | 2007-02-27 08:00:06 -0800 (Tue, 27 Feb 2007) | 2 lines
    
      tabify
    ........
      r53994 | jeremy.hylton | 2007-02-27 08:13:23 -0800 (Tue, 27 Feb 2007) | 5 lines
    
      tabify
    
      Note that ast.c still has a mix of tabs and spaces, because it
      attempts to use four-space indents for more of the new code.
    ........
      r53996 | jeremy.hylton | 2007-02-27 09:24:48 -0800 (Tue, 27 Feb 2007) | 2 lines
    
      whitespace normalization
    ........
      r53997 | jeremy.hylton | 2007-02-27 10:29:45 -0800 (Tue, 27 Feb 2007) | 24 lines
    
      Add checking for a number of metaclass error conditions.
    
      We add some new rules that are required for preserving internal
      invariants of types.
    
      1.  If type (or a subclass of type) appears in bases, it must appear
          before any non-type bases.  If a non-type base (like a regular
          new-style class) occurred first, it could trick type into
          allocating the new class an __dict__ which must be impossible.
    
      2. There are several checks that are made of bases when creating a
         type.  Those checks are now repeated when assigning to __bases__.
         We also add the restriction that assignment to __bases__ may not
         change the metaclass of the type.
    
      Add new tests for these cases and for a few other oddball errors that
      were no previously tested.  Remove a crasher test that was fixed.
    
      Also some internal refactoring:  Extract the code to find the most
      derived metaclass of a type and its bases.  It is now needed in two
      places.  Rewrite the TypeError checks in test_descr to use doctest.
      The tests now clearly show what exception they expect to see.
    ........
      r53998 | jeremy.hylton | 2007-02-27 10:33:31 -0800 (Tue, 27 Feb 2007) | 2 lines
    
      Add news about changes to metaclasses and __bases__ error checking.
    ........
      r54016 | armin.rigo | 2007-02-28 01:25:29 -0800 (Wed, 28 Feb 2007) | 3 lines
    
      Modify the segfaulting example to show why r53997 is not a solution to
      it.
    ........
      r54022 | brett.cannon | 2007-02-28 10:15:00 -0800 (Wed, 28 Feb 2007) | 2 lines
    
      Add a test for instantiating SyntaxError with no arguments.
    ........
      r54026 | raymond.hettinger | 2007-02-28 10:27:41 -0800 (Wed, 28 Feb 2007) | 1 line
    
      Docstring nit.
    ........
      r54033 | raymond.hettinger | 2007-02-28 10:37:52 -0800 (Wed, 28 Feb 2007) | 1 line
    
      Prepare collections module for pure python code entries.
    ........
      r54053 | raymond.hettinger | 2007-02-28 22:16:43 -0800 (Wed, 28 Feb 2007) | 1 line
    
      Add collections.NamedTuple
    ........
      r54054 | neal.norwitz | 2007-02-28 23:04:41 -0800 (Wed, 28 Feb 2007) | 1 line
    
      Add Pat and Eric for work on PEP 3101 in the sandbox
    ........
      r54061 | andrew.kuchling | 2007-03-01 06:36:12 -0800 (Thu, 01 Mar 2007) | 1 line
    
      Add NamedTuple
    ........
      r54080 | georg.brandl | 2007-03-02 06:37:12 -0800 (Fri, 02 Mar 2007) | 2 lines
    
      Bug #1628895: some better tries to find HTML documentation in pydoc.
    ........
      r54086 | raymond.hettinger | 2007-03-02 11:20:46 -0800 (Fri, 02 Mar 2007) | 1 line
    
      Fix embarrassing typo and fix constantification of None
    ........
      r54088 | georg.brandl | 2007-03-02 12:30:14 -0800 (Fri, 02 Mar 2007) | 2 lines
    
      Bugs #1668032, #1668036, #1669304: clarify behavior of PyMem_Realloc and _Resize.
    ........
      r54114 | georg.brandl | 2007-03-04 09:18:54 -0800 (Sun, 04 Mar 2007) | 2 lines
    
      Fix a bug in test_dict and test_userdict, found at the PyPy sprint.
    ........
      r54124 | skip.montanaro | 2007-03-04 12:52:28 -0800 (Sun, 04 Mar 2007) | 2 lines
    
      Teach setup.py how to find Berkeley DB on Macs using MacPorts.
    ........
      r54125 | skip.montanaro | 2007-03-04 12:54:12 -0800 (Sun, 04 Mar 2007) | 1 line
    
      note MacPorts/BerkDB change in setup.py
    ........
      r54136 | neal.norwitz | 2007-03-04 23:52:01 -0800 (Sun, 04 Mar 2007) | 1 line
    
      Added Pete for 3101 too
    ........
      r54138 | facundo.batista | 2007-03-05 08:31:54 -0800 (Mon, 05 Mar 2007) | 1 line
    
      Minor corrections to docs, and an explanation comentary
    ........
      r54139 | georg.brandl | 2007-03-05 14:28:08 -0800 (Mon, 05 Mar 2007) | 3 lines
    
      Patch #1674228: when assigning a slice (old-style), check for the
      sq_ass_slice instead of the sq_slice slot.
    ........
      r54149 | georg.brandl | 2007-03-06 01:33:01 -0800 (Tue, 06 Mar 2007) | 3 lines
    
      Nit: a struct field is set to GenericAlloc, not GenericAlloc().
    ........
      r54150 | georg.brandl | 2007-03-06 02:02:47 -0800 (Tue, 06 Mar 2007) | 3 lines
    
      Patch #1671450: add a section about subclassing builtin types to the
      "extending and embedding" tutorial.
    ........
      r54152 | martin.v.loewis | 2007-03-06 02:41:24 -0800 (Tue, 06 Mar 2007) | 2 lines
    
      Patch #1121142: Implement ZipFile.open.
    ........
      r54154 | georg.brandl | 2007-03-06 03:51:14 -0800 (Tue, 06 Mar 2007) | 2 lines
    
      A test case for the fix in #1674228.
    ........
      r54156 | georg.brandl | 2007-03-06 03:52:24 -0800 (Tue, 06 Mar 2007) | 2 lines
    
      Patch #1672481: fix bug in idlelib.MultiCall.
    ........
      r54159 | georg.brandl | 2007-03-06 04:17:50 -0800 (Tue, 06 Mar 2007) | 1 line
    
      Bug #1674503: close the file opened by execfile() in an error condition.
    ........
      r54160 | georg.brandl | 2007-03-06 05:32:52 -0800 (Tue, 06 Mar 2007) | 3 lines
    
      Fix another reincarnation of bug #1576657 in defaultdict.
    ........
      r54162 | georg.brandl | 2007-03-06 05:35:00 -0800 (Tue, 06 Mar 2007) | 2 lines
    
      A test case for the defaultdict KeyError bug.
    ........
      r54164 | georg.brandl | 2007-03-06 05:37:45 -0800 (Tue, 06 Mar 2007) | 3 lines
    
      Patch #1663234: you can now run doctest on test files and modules
      using "python -m doctest [-v] filename ...".
    ........
      r54165 | martin.v.loewis | 2007-03-06 06:43:00 -0800 (Tue, 06 Mar 2007) | 3 lines
    
      Patch #912410: Replace HTML entity references for attribute values
      in HTMLParser.
    ........
      r54166 | skip.montanaro | 2007-03-06 07:41:38 -0800 (Tue, 06 Mar 2007) | 1 line
    
      patch 1673619 - identify extension modules which cannot be built
    ........
      r54167 | guido.van.rossum | 2007-03-06 07:50:01 -0800 (Tue, 06 Mar 2007) | 5 lines
    
      Patch #1646728: datetime.fromtimestamp fails with negative
      fractional times.  With unittest.
    
      Somebody please backport to 2.5.
    ........
      r54169 | georg.brandl | 2007-03-06 09:49:14 -0800 (Tue, 06 Mar 2007) | 2 lines
    
      Fix cmp vs. key argument for list.sort.
    ........
      r54170 | georg.brandl | 2007-03-06 10:21:32 -0800 (Tue, 06 Mar 2007) | 2 lines
    
      Small nit, found by Neal.
    ........
      r54171 | georg.brandl | 2007-03-06 10:29:58 -0800 (Tue, 06 Mar 2007) | 3 lines
    
      Patch #1602128: clarify that richcmp methods can return NotImplemented
      and should return True or False otherwise.
    ........
      r54173 | georg.brandl | 2007-03-06 10:41:12 -0800 (Tue, 06 Mar 2007) | 2 lines
    
      Patch #1638879: don't accept strings with embedded NUL bytes in long().
    ........
      r54175 | georg.brandl | 2007-03-06 10:47:31 -0800 (Tue, 06 Mar 2007) | 2 lines
    
      Patch #1673121: update README wrt. OSX default shell.
    ........
      r54177 | georg.brandl | 2007-03-06 10:59:11 -0800 (Tue, 06 Mar 2007) | 3 lines
    
      Patch #1654417: make operator.{get,set,del}slice use the full range
      of Py_ssize_t.
    ........
      r54180 | walter.doerwald | 2007-03-06 12:38:57 -0800 (Tue, 06 Mar 2007) | 4 lines
    
      Patch for bug #1633621: if curses.resizeterm() or
      curses.resize_term() is called, update _curses.LINES,
      _curses.COLS, curses.LINES and curses.COLS.
    ........
      r54182 | walter.doerwald | 2007-03-06 13:15:24 -0800 (Tue, 06 Mar 2007) | 2 lines
    
      Document change to curses.
    ........
      r54188 | georg.brandl | 2007-03-06 16:34:46 -0800 (Tue, 06 Mar 2007) | 5 lines
    
      Variant of patch #697613: don't exit the interpreter on a SystemExit
      exception if the -i command line option or PYTHONINSPECT environment
      variable is given, but break into the interactive interpreter just like
      on other exceptions or normal program exit.
       (backport)
    ........
      r54189 | georg.brandl | 2007-03-06 16:40:28 -0800 (Tue, 06 Mar 2007) | 4 lines
    
      Patch #703779: unset __file__ in __main__ after running a file. This
      makes the filenames the warning module prints much more sensible when
      a PYTHONSTARTUP file is used.
    ........
      r54192 | george.yoshida | 2007-03-06 20:21:18 -0800 (Tue, 06 Mar 2007) | 2 lines
    
      add versionadded info
    ........
      r54195 | georg.brandl | 2007-03-06 23:39:06 -0800 (Tue, 06 Mar 2007) | 2 lines
    
      Patch #812285: allow multiple auth schemes in AbstractBasicAuthHandler.
    ........
      r54197 | georg.brandl | 2007-03-07 00:31:51 -0800 (Wed, 07 Mar 2007) | 3 lines
    
      Patch #1001604: glob.glob() now returns unicode filenames if it was
      given a unicode argument and os.listdir() returns unicode filenames.
    ........
      r54199 | georg.brandl | 2007-03-07 01:09:40 -0800 (Wed, 07 Mar 2007) | 3 lines
    
      Patches #1550273, #1550272: fix a few bugs in unittest and add a
      comprehensive test suite for the module.
    ........
      r54201 | georg.brandl | 2007-03-07 01:21:06 -0800 (Wed, 07 Mar 2007) | 3 lines
    
      Patch #787789: allow to pass custom TestRunner instances to unittest's
      main() function.
    ........
      r54202 | georg.brandl | 2007-03-07 01:34:45 -0800 (Wed, 07 Mar 2007) | 2 lines
    
      Patch #1669331: clarify shutil.copyfileobj() behavior wrt. file position.
    ........
      r54204 | martin.v.loewis | 2007-03-07 03:04:33 -0800 (Wed, 07 Mar 2007) | 2 lines
    
      Bug #1115886: os.path.splitext('.cshrc') gives now ('.cshrc', '').
    ........
      r54206 | georg.brandl | 2007-03-07 03:37:42 -0800 (Wed, 07 Mar 2007) | 2 lines
    
      Patch #1675471: convert test_pty to unittest.
    ........
      r54207 | georg.brandl | 2007-03-07 03:54:49 -0800 (Wed, 07 Mar 2007) | 4 lines
    
      Add some sanity checks to unittest.TestSuite's addTest(s) methods.
      Fixes #878275.
    ........
      r54209 | guido.van.rossum | 2007-03-07 07:16:29 -0800 (Wed, 07 Mar 2007) | 3 lines
    
      Windows doesn't support negative timestamps.  Skip the tests involving them
      if os.name == "nt".
    ........
      r54219 | martin.v.loewis | 2007-03-08 05:42:43 -0800 (Thu, 08 Mar 2007) | 2 lines
    
      Add missing ) in parenthical remark.
    ........
      r54220 | georg.brandl | 2007-03-08 09:49:06 -0800 (Thu, 08 Mar 2007) | 2 lines
    
      Fix #1676656: \em is different from \emph...
    ........
      r54222 | georg.brandl | 2007-03-08 10:37:31 -0800 (Thu, 08 Mar 2007) | 2 lines
    
      Add a NEWS entry for rev. 54207,8.
    ........
      r54225 | raymond.hettinger | 2007-03-08 11:24:27 -0800 (Thu, 08 Mar 2007) | 1 line
    
      SF 1676321:  empty() returned wrong result
    ........
      r54227 | collin.winter | 2007-03-08 11:58:14 -0800 (Thu, 08 Mar 2007) | 1 line
    
      Backported r54226 from p3yk: Move test_unittest, test_doctest and test_doctest2 higher up in the testing order.
    ........
      r54230 | raymond.hettinger | 2007-03-08 13:33:47 -0800 (Thu, 08 Mar 2007) | 1 line
    
      SF #1637850:  make_table in difflib did not work with unicode
    ........
      r54232 | collin.winter | 2007-03-08 14:16:25 -0800 (Thu, 08 Mar 2007) | 1 line
    
      Patch #1668482: don't use '-' in mkstemp
    ........
      r54233 | brett.cannon | 2007-03-08 15:58:11 -0800 (Thu, 08 Mar 2007) | 10 lines
    
      Introduce test.test_support.TransientResource.  It's a context manager to
      surround calls to resources that may or may not be available.  Specifying the
      expected exception and attributes to be raised if the resource is not available
      prevents overly broad catching of exceptions.
    
      This is meant to help suppress spurious failures by raising
      test.test_support.ResourceDenied if the exception matches.  It would probably
      be good to go through the various network tests and surround the calls to catch
      connection timeouts (as done with test_socket_ssl in this commit).
    ........
      r54234 | collin.winter | 2007-03-08 19:15:56 -0800 (Thu, 08 Mar 2007) | 1 line
    
      Patch #1481079: Support of HTTP_REFERER in CGIHTTPServer.py
    ........
      r54235 | collin.winter | 2007-03-08 19:26:32 -0800 (Thu, 08 Mar 2007) | 1 line
    
      Add NEWS item for patch #1481079 (r54234).
    ........
      r54237 | neal.norwitz | 2007-03-08 21:59:01 -0800 (Thu, 08 Mar 2007) | 1 line
    
      Fix SF #1676971, Complex OverflowError has a typo
    ........
      r54239 | georg.brandl | 2007-03-09 04:58:41 -0800 (Fri, 09 Mar 2007) | 2 lines
    
      Typo.
    ........
      r54240 | martin.v.loewis | 2007-03-09 07:35:55 -0800 (Fri, 09 Mar 2007) | 2 lines
    
      Patch #957003: Implement smtplib.LMTP.
    ........
      r54243 | collin.winter | 2007-03-09 10:09:10 -0800 (Fri, 09 Mar 2007) | 2 lines
    
      Bug #1629566: clarify the docs on the return values of parsedate() and parsedate_tz() in email.utils and rfc822.
    ........
      r54244 | thomas.heller | 2007-03-09 11:21:28 -0800 (Fri, 09 Mar 2007) | 3 lines
    
      Fix bug #1646630: ctypes.string_at(buf, 0) and ctypes.wstring_at(buf, 0)
      returned string up to the first NUL character.
    ........
      r54245 | martin.v.loewis | 2007-03-09 11:36:01 -0800 (Fri, 09 Mar 2007) | 2 lines
    
      Add Ziga Seilnacht.
    ........
      r54247 | collin.winter | 2007-03-09 12:33:07 -0800 (Fri, 09 Mar 2007) | 2 lines
    
      Patch #1491866: change the complex() constructor to allow parthensized forms. This means complex(repr(x)) now works instead of raising a ValueError.
    ........
      r54248 | thomas.heller | 2007-03-09 12:39:22 -0800 (Fri, 09 Mar 2007) | 7 lines
    
      Bug #1651235: When a tuple was passed to a ctypes function call,
      Python would crash instead of raising an error.
    
      The crash was caused by a section of code that should have been
      removed long ago, at that time ctypes had other ways to pass
      parameters to function calls.
    ........
      r54250 | collin.winter | 2007-03-09 15:30:39 -0800 (Fri, 09 Mar 2007) | 1 line
    
      Hashing simplification pointed out by Thomas Wouters.
    ........
      r54252 | collin.winter | 2007-03-09 18:23:40 -0800 (Fri, 09 Mar 2007) | 5 lines
    
      * Unlink test files before and after each test; hopefully this will cut down on recent buildbot failures in test_islink.
      * Drop safe_remove() in favor of test_support.unlink().
      * Fix the indentation of test_samefile so that it runs.
    ........
      r54253 | collin.winter | 2007-03-09 18:51:26 -0800 (Fri, 09 Mar 2007) | 3 lines
    
      Bug #1531963: Make SocketServer.TCPServer's server_address always be equal to calling getsockname() on the server's socket.
      Will backport.
    ........
      r54254 | neal.norwitz | 2007-03-09 19:19:18 -0800 (Fri, 09 Mar 2007) | 4 lines
    
      Simplify a little by handling the TCP case first.
      Update to use predominant style of spaces around = in args list
      and print to stderr if debugging.
    ........
      r54256 | collin.winter | 2007-03-09 19:35:34 -0800 (Fri, 09 Mar 2007) | 1 line
    
      Add proper attribution for a bug fix.
    ........
      r54257 | georg.brandl | 2007-03-09 23:38:14 -0800 (Fri, 09 Mar 2007) | 2 lines
    
      Typos.
    ........
      r54260 | collin.winter | 2007-03-10 06:33:32 -0800 (Sat, 10 Mar 2007) | 1 line
    
      Convert an assert to a raise so it works even in the presence of -O.
    ........
      r54262 | collin.winter | 2007-03-10 06:41:48 -0800 (Sat, 10 Mar 2007) | 2 lines
    
      Patch #1599845: Add an option to disable the implicit calls to server_bind() and server_activate() in the constructors for TCPServer, SimpleXMLRPCServer and DocXMLRPCServer.
    ........
      r54268 | georg.brandl | 2007-03-11 00:28:46 -0800 (Sun, 11 Mar 2007) | 2 lines
    
      Add missing "return" statements in exception handler.
    ........
      r54270 | ziga.seilnacht | 2007-03-11 08:54:54 -0700 (Sun, 11 Mar 2007) | 3 lines
    
      Patch #1675981: remove unreachable code from type.__new__() method.
      __dict__ and __weakref__ are removed from the slots tuple earlier
      in the code, in the loop that mangles slot names. Will backport.
    ........
      r54271 | collin.winter | 2007-03-11 09:00:20 -0700 (Sun, 11 Mar 2007) | 3 lines
    
      Patch #1192590: Fix pdb's "ignore" and "condition" commands so they trap the IndexError caused by passing in an invalid breakpoint number.
      Will backport.
    ........
      r54274 | vinay.sajip | 2007-03-11 11:32:07 -0700 (Sun, 11 Mar 2007) | 1 line
    
      Fix resource leak reported in SF #1516995.
    ........
      r54278 | collin.winter | 2007-03-11 18:55:54 -0700 (Sun, 11 Mar 2007) | 4 lines
    
      Patch #1678662: ftp.python.org does not exist. So the testcode in urllib.py must use a more
      stable FTP.
      Will backport.
    ........
      r54280 | barry.warsaw | 2007-03-11 20:20:01 -0700 (Sun, 11 Mar 2007) | 8 lines
    
      Tokio Kikuchi's fix for SF bug #1629369; folding whitespace allowed in the
      display name of an email address, e.g.
    
      Foo
      \tBar <foo@example.com>
    
      Test case added by Barry.
    ........
      r54282 | skip.montanaro | 2007-03-11 20:30:50 -0700 (Sun, 11 Mar 2007) | 4 lines
    
      Sane humans would call these invalid tests, but Andrew McNamara pointed out
      that given the inputs in these tests Excel does indeed produce the output
      these tests expect.  Document that for future confused folks.
    ........
      r54283 | martin.v.loewis | 2007-03-12 03:50:39 -0700 (Mon, 12 Mar 2007) | 2 lines
    
      Bug #1675511: Use -Kpic instead of -xcode=pic32 on Solaris/x86.
    ........
      r54285 | martin.v.loewis | 2007-03-12 04:01:10 -0700 (Mon, 12 Mar 2007) | 2 lines
    
      Patch #1677862: Require a space or tab after import in .pth files.
    ........
      r54287 | georg.brandl | 2007-03-12 06:17:36 -0700 (Mon, 12 Mar 2007) | 8 lines
    
      Backport from Py3k branch:
    
      Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir.
    
      Had to change a few bits of the patch because classobjs and __methods__ are still
      in Py2.6.
    ........
      r54288 | georg.brandl | 2007-03-12 07:30:05 -0700 (Mon, 12 Mar 2007) | 3 lines
    
      Bug #1678647: write a newline after printing an exception in any
      case, even when converting the value to a string failed.
    ........
      r54290 | collin.winter | 2007-03-12 08:57:19 -0700 (Mon, 12 Mar 2007) | 1 line
    
      Patch #1678088: convert test_operations to use unittest, fold the result into test_dict.
    ........
      r54291 | collin.winter | 2007-03-12 09:11:39 -0700 (Mon, 12 Mar 2007) | 3 lines
    
      Bug #742342: make Python stop segfaulting on infinitely-recursive reload()s. Fixed by patch #922167.
      Will backport.
    ........
      r54292 | georg.brandl | 2007-03-12 09:15:09 -0700 (Mon, 12 Mar 2007) | 2 lines
    
      Typo fix.
    ........
      r54295 | collin.winter | 2007-03-12 10:24:07 -0700 (Mon, 12 Mar 2007) | 1 line
    
      Patch #1670993: Refactor test_threadedtempfile.py to use unittest.
    ........
      r54296 | tim.peters | 2007-03-12 11:07:52 -0700 (Mon, 12 Mar 2007) | 2 lines
    
      Whitespace normalization.
    ........
      r54297 | tim.peters | 2007-03-12 11:09:22 -0700 (Mon, 12 Mar 2007) | 2 lines
    
      Set missing svn:eol-style property on text files.
    ........
      r54315 | brett.cannon | 2007-03-12 19:34:09 -0700 (Mon, 12 Mar 2007) | 8 lines
    
      Add test.test_support.transient_internet .  Returns a context manager that
      nests test.test_support.TransientResource context managers that capture
      exceptions raised when the Internet connection is flaky.
    
      Initially using in test_socket_ssl but should probably be expanded to cover any
      test that should not raise the captured exceptions if the Internet connection
      works.
    ........
      r54316 | brett.cannon | 2007-03-12 20:05:40 -0700 (Mon, 12 Mar 2007) | 2 lines
    
      Fix a typo where the variable name was not updated.
    ........
      r54318 | neal.norwitz | 2007-03-12 21:59:58 -0700 (Mon, 12 Mar 2007) | 1 line
    
      Add Jerry Seutter for a bunch of his recent patches refactoring tests
    ........
      r54319 | neal.norwitz | 2007-03-12 22:07:14 -0700 (Mon, 12 Mar 2007) | 7 lines
    
      Add some other acks for recent checkins:
    
      Brian Leair  - 922167
      Tomer Filiba - 1591665
      Jeremy Jones - 1192590
    ........
      r54321 | neal.norwitz | 2007-03-12 22:31:38 -0700 (Mon, 12 Mar 2007) | 9 lines
    
      Fix some style nits:
        * lines too long
        * wrong indentation
        * space after a function name
        * wrong function name in error string
        * simplifying some logic
    
      Also add an error check to PyDict_SetItemString.
    ........
      r54322 | georg.brandl | 2007-03-13 00:23:16 -0700 (Tue, 13 Mar 2007) | 2 lines
    
      Typo and grammar fixes.
    ........
      r54323 | georg.brandl | 2007-03-13 00:50:57 -0700 (Tue, 13 Mar 2007) | 2 lines
    
      Patch #1679379: add documentation for fnmatch.translate().
    ........
      r54325 | georg.brandl | 2007-03-13 00:57:51 -0700 (Tue, 13 Mar 2007) | 2 lines
    
      Patch #1642844: comments to clarify the complexobject constructor.
    ........
      r54326 | georg.brandl | 2007-03-13 01:14:27 -0700 (Tue, 13 Mar 2007) | 3 lines
    
      Patch #1668100: urllib2 now correctly raises URLError instead of
      OSError if accessing a local file via the file:// protocol fails.
    ........
      r54327 | georg.brandl | 2007-03-13 02:32:11 -0700 (Tue, 13 Mar 2007) | 4 lines
    
      Patch #1635454: the csv.DictWriter class now includes the offending
      field names in its exception message if you try to write a record with
      a dictionary containing fields not in the CSV field names list.
    ........
      r54328 | georg.brandl | 2007-03-13 02:41:31 -0700 (Tue, 13 Mar 2007) | 3 lines
    
      Patch #1555098: use str.join() instead of repeated string
      concatenation in robotparser.
    ........
      r54329 | georg.brandl | 2007-03-13 03:06:48 -0700 (Tue, 13 Mar 2007) | 3 lines
    
      Patch #1542681: add entries for "with", "as" and "CONTEXTMANAGERS" to
      pydoc's help keywords.
    ........
      r54331 | georg.brandl | 2007-03-13 03:19:22 -0700 (Tue, 13 Mar 2007) | 3 lines
    
      Patch #1569798: fix a bug in distutils when building Python from a
      directory within sys.exec_prefix.
    ........
      r54333 | martin.v.loewis | 2007-03-13 03:24:00 -0700 (Tue, 13 Mar 2007) | 4 lines
    
      Patch #1449244: Support Unicode strings in
      email.message.Message.{set_charset,get_content_charset}.
      Will backport.
    ........
      r54335 | lars.gustaebel | 2007-03-13 03:47:19 -0700 (Tue, 13 Mar 2007) | 34 lines
    
      This is the implementation of POSIX.1-2001 (pax) format read/write
      support.
    
      The TarInfo class now contains all necessary logic to process and
      create tar header data which has been moved there from the TarFile
      class. The fromtarfile() method was added. The new path and linkpath
      properties are aliases for the name and linkname attributes in
      correspondence to the pax naming scheme.
    
      The TarFile constructor and classmethods now accept a number of
      keyword arguments which could only be set as attributes before (e.g.
      dereference, ignore_zeros). The encoding and pax_headers arguments
      were added for pax support. There is a new tarinfo keyword argument
      that allows using subclassed TarInfo objects in TarFile.
    
      The boolean TarFile.posix attribute is deprecated, because now three
      tar formats are supported. Instead, the desired format for writing is
      specified using the constants USTAR_FORMAT, GNU_FORMAT and PAX_FORMAT
      as the format keyword argument. This change affects TarInfo.tobuf()
      as well.
    
      The test suite has been heavily reorganized and partially rewritten.
      A new testtar.tar was added that contains sample data in many formats
      from 4 different tar programs.
    
      Some bugs and quirks that also have been fixed:
      Directory names do no longer have a trailing slash in TarInfo.name or
      TarFile.getnames().
      Adding the same file twice does not create a hardlink file member.
      The TarFile constructor does no longer need a name argument.
      The TarFile._mode attribute was renamed to mode and contains either
      'r', 'w' or 'a'.
    ........
      r54336 | georg.brandl | 2007-03-13 05:34:25 -0700 (Tue, 13 Mar 2007) | 3 lines
    
      Bug #1622896: fix a rare corner case where the bz2 module raised an
      error in spite of a succesful compression.
    ........
      r54338 | lars.gustaebel | 2007-03-13 08:47:07 -0700 (Tue, 13 Mar 2007) | 3 lines
    
      Quick fix for tests that fail on systems with an encoding other
      than 'iso8859-1'.
    ........
      r54339 | georg.brandl | 2007-03-13 10:43:32 -0700 (Tue, 13 Mar 2007) | 4 lines
    
      Patch #1603688: ConfigParser.SafeConfigParser now checks values that
      are set for invalid interpolation sequences that would lead to errors
      on reading back those values.
    ........
      r54341 | georg.brandl | 2007-03-13 11:15:41 -0700 (Tue, 13 Mar 2007) | 3 lines
    
      Patch #1581073: add a flag to textwrap that prevents the dropping of
      whitespace while wrapping.
    ........
      r54343 | georg.brandl | 2007-03-13 11:24:40 -0700 (Tue, 13 Mar 2007) | 2 lines
    
      Patch #1605192: list allowed states in error messages for imaplib.
    ........
      r54344 | georg.brandl | 2007-03-13 11:31:49 -0700 (Tue, 13 Mar 2007) | 4 lines
    
      Patch #1537850: tempfile.NamedTemporaryFile now has a "delete" parameter
      which can be set to False to prevent the default delete-on-close
      behavior.
    ........
      r54345 | collin.winter | 2007-03-13 11:53:04 -0700 (Tue, 13 Mar 2007) | 9 lines
    
      Add acks for recent patch checkins:
    
      Arvin Schnell - 1668482
      S?\195?\169bastien Martini - 1481079
      Heiko Wundram - 1491866
      Damon Kohler - 1545011
      Peter Parente - 1599845
      Bjorn Lindqvist - 1678662
    ........
      r54346 | georg.brandl | 2007-03-13 12:00:36 -0700 (Tue, 13 Mar 2007) | 2 lines
    
      Acks for recent patches.
    ........
      r54347 | georg.brandl | 2007-03-13 12:18:18 -0700 (Tue, 13 Mar 2007) | 3 lines
    
      Fix a tab.
    ........
      r54348 | georg.brandl | 2007-03-13 12:32:21 -0700 (Tue, 13 Mar 2007) | 4 lines
    
      Patch #1533909: the timeit module now accepts callables in addition to
      strings for the code to time and the setup code. Also added two
      convenience functions for instantiating a Timer and calling its methods.
    ........
      r54352 | georg.brandl | 2007-03-13 13:02:57 -0700 (Tue, 13 Mar 2007) | 3 lines
    
      Patch #1530482: add pydoc.render_doc() which returns the documentation
      for a thing instead of paging it to stdout, which pydoc.doc() does.
    ........
      r54357 | thomas.heller | 2007-03-13 13:42:52 -0700 (Tue, 13 Mar 2007) | 1 line
    
      Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl.
    ........
      r54358 | georg.brandl | 2007-03-13 13:46:32 -0700 (Tue, 13 Mar 2007) | 2 lines
    
      Patch #1444529: the builtin compile() now accepts keyword arguments.
       (backport)
    ........
      r54359 | thomas.heller | 2007-03-13 14:01:39 -0700 (Tue, 13 Mar 2007) | 1 line
    
      Add versionadded marker for ctypes.c_bool.
    ........
      r54360 | georg.brandl | 2007-03-13 14:08:15 -0700 (Tue, 13 Mar 2007) | 3 lines
    
      Patch #1393667: pdb now has a "run" command which restarts the debugged
      Python program, optionally with different arguments.
    ........
      r54361 | georg.brandl | 2007-03-13 14:32:01 -0700 (Tue, 13 Mar 2007) | 3 lines
    
      Deprecate commands.getstatus().
    ........
      r54362 | georg.brandl | 2007-03-13 14:32:56 -0700 (Tue, 13 Mar 2007) | 2 lines
    
      NEWS entry for getstatus() deprecation.
    ........
      r54363 | georg.brandl | 2007-03-13 14:58:44 -0700 (Tue, 13 Mar 2007) | 4 lines
    
      Patch #1429539: pdb now correctly initializes the __main__ module for
      the debugged script, which means that imports from __main__ work
      correctly now.
    ........
      r54364 | georg.brandl | 2007-03-13 15:07:36 -0700 (Tue, 13 Mar 2007) | 4 lines
    
      Patch #957650: "%var%" environment variable references are now properly
      expanded in ntpath.expandvars(), also "~user" home directory references
      are recognized and handled on Windows.
    ........
      r54365 | georg.brandl | 2007-03-13 15:16:30 -0700 (Tue, 13 Mar 2007) | 2 lines
    
      Patch #1194449: correctly detect unbound methods in pydoc.
    ........
      r54367 | georg.brandl | 2007-03-13 15:49:43 -0700 (Tue, 13 Mar 2007) | 5 lines
    
      Patch #1185447: binascii.b2a_qp() now correctly quotes binary characters
      with ASCII value less than 32. Also, it correctly quotes dots only if
      they occur on a single line, as opposed to the previous behavior of
      quoting dots if they are the second character of any line.
    ........
      r54368 | collin.winter | 2007-03-13 16:02:15 -0700 (Tue, 13 Mar 2007) | 1 line
    
      Inline PyImport_GetModulesReloading().
    ........
      r54371 | barry.warsaw | 2007-03-13 21:59:50 -0700 (Tue, 13 Mar 2007) | 6 lines
    
      SF bug #1582282; decode_header() incorrectly splits not-conformant RFC
      2047-like headers where there is no whitespace between encoded words.  This
      fix changes the matching regexp to include a trailing lookahead assertion that
      the closing ?= must be followed by whitespace, newline, or end-of-string.
      This also changes the regexp to add the MULTILINE flag.
    ........
      r54372 | gregory.p.smith | 2007-03-14 00:17:40 -0700 (Wed, 14 Mar 2007) | 2 lines
    
      correct order and names of the less often used keyword parameters.
    ........
      r54373 | gregory.p.smith | 2007-03-14 00:19:50 -0700 (Wed, 14 Mar 2007) | 5 lines
    
      Its time to stop listing (Unix, Windows) when we really mean "everything but Mac OS 9"
      now that nobody is likely to use Python on Mac OS 9 and most of the (Mac) platform
      items are all OS X special API specific since OS X is unixy enough for these modules
      to be available out of the box.
    ........
      r54376 | georg.brandl | 2007-03-14 01:27:52 -0700 (Wed, 14 Mar 2007) | 4 lines
    
      Bug #767111: fix long-standing bug in urllib which caused an
      AttributeError instead of an IOError when the server's response didn't
      contain a valid HTTP status line.
    ........
      r54378 | ziga.seilnacht | 2007-03-14 05:24:09 -0700 (Wed, 14 Mar 2007) | 4 lines
    
      Patch #1680015: Don't modify __slots__ tuple if it contains an unicode
      name. Remove a reference leak that happened if the name could not be
      converted to string. Will backport.
    ........
      r54386 | martin.v.loewis | 2007-03-14 13:02:31 -0700 (Wed, 14 Mar 2007) | 3 lines
    
      Patch #1559413: Fix test_cmd_line if sys.executable contains a space.
      Will backport.
    ........
      r54389 | brett.cannon | 2007-03-14 14:40:13 -0700 (Wed, 14 Mar 2007) | 3 lines
    
      Note how test_socket_ssl has various exceptions that deal with a flaky Net
      connection are silenced.
    ........
      r54390 | brett.cannon | 2007-03-14 14:44:15 -0700 (Wed, 14 Mar 2007) | 2 lines
    
      Raise ResourceDenied in test_urllib2net when the Net connection goes bad.
    ........
      r54391 | neal.norwitz | 2007-03-14 21:41:20 -0700 (Wed, 14 Mar 2007) | 1 line
    
      Wrap a long line and fix a typo (is -> if)
    ........
      r54392 | georg.brandl | 2007-03-15 00:38:14 -0700 (Thu, 15 Mar 2007) | 3 lines
    
      Patch #1680978: consistently use "alive" instead of "active" in the
      thread lib doc.
    ........
      r54394 | georg.brandl | 2007-03-15 00:41:30 -0700 (Thu, 15 Mar 2007) | 3 lines
    
      Patch #1681153: the wave module now closes a file object it opened if
      initialization failed.
    ........
      r54397 | ziga.seilnacht | 2007-03-15 04:44:55 -0700 (Thu, 15 Mar 2007) | 3 lines
    
      Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
      the implementation for __reduce__ and __reduce_ex__ into two separate
      functions. Fixes bug #931877. Will backport.
    ........
      r54404 | collin.winter | 2007-03-15 21:11:30 -0700 (Thu, 15 Mar 2007) | 3 lines
    
      Patch #1642547: Fix an error/crash when encountering syntax errors in complex if statements.
      Will backport.
    ........
      r54406 | georg.brandl | 2007-03-16 00:55:09 -0700 (Fri, 16 Mar 2007) | 5 lines
    
      Bug #1681228: the webbrowser module now correctly uses the default
      GNOME or KDE browser, depending on whether there is a session of one
      of those present. Also, it tries the Windows default browser before
      trying Mozilla variants.
       (backport)
    ........
      r54407 | georg.brandl | 2007-03-16 01:22:40 -0700 (Fri, 16 Mar 2007) | 4 lines
    
      Patch #1273829: os.walk() now has a "followlinks" parameter. If set to
      True (which is not the default), it visits symlinks pointing to
      directories.
    ........
      r54408 | georg.brandl | 2007-03-16 01:24:21 -0700 (Fri, 16 Mar 2007) | 2 lines
    
      Add \versionadded tag.
    ........
      r54409 | georg.brandl | 2007-03-16 01:33:47 -0700 (Fri, 16 Mar 2007) | 2 lines
    
      RFE #1670167: fix in isinstance() docs.
    ........
      r54412 | ziga.seilnacht | 2007-03-16 04:59:38 -0700 (Fri, 16 Mar 2007) | 3 lines
    
      Patch #1623563: allow __class__ assignment for classes with __slots__.
      The old and the new class are still required to have the same slot
      names, but the order in which they are specified is not relevant.
    ........
      r54413 | ziga.seilnacht | 2007-03-16 05:11:11 -0700 (Fri, 16 Mar 2007) | 2 lines
    
      Whitespace cleanup. Also remove the empty lines
      from the previous check in.
    ........
      r54414 | jeremy.hylton | 2007-03-16 07:49:11 -0700 (Fri, 16 Mar 2007) | 2 lines
    
      Remove warning: funcion declaration isn't a prototype
    ........
      r54415 | jeremy.hylton | 2007-03-16 08:59:47 -0700 (Fri, 16 Mar 2007) | 11 lines
    
      Clean up formatting of this file.
    
      The file should now follow PEP 7, except that it uses 4 space indents
      (in the style of Py3k).  This particular code would be really hard to
      read with the regular tab idents.
    
      Other changes:
       - reflow long lines
       - change multi-line conditionals to have test at end of line
    ........
      r54417 | collin.winter | 2007-03-16 14:13:35 -0700 (Fri, 16 Mar 2007) | 1 line
    
      Patch #1676994: Refactor test_popen2 to use unittest.
    ........
      r54418 | collin.winter | 2007-03-16 14:15:35 -0700 (Fri, 16 Mar 2007) | 1 line
    
      Remove test/output/test_popen2 (missed in r54417).
    ........
      r54419 | collin.winter | 2007-03-16 15:16:08 -0700 (Fri, 16 Mar 2007) | 1 line
    
      Patch 1339796: add a relpath() function to os.path.
    ........
      r54421 | georg.brandl | 2007-03-17 09:08:45 -0700 (Sat, 17 Mar 2007) | 5 lines
    
      Patch #1675423: PyComplex_AsCComplex() now tries to convert an object
      to complex using its __complex__() method before falling back to the
      __float__() method. Therefore, the functions in the cmath module now
      can operate on objects that define a __complex__() method.
       (backport)
    ........
      r54423 | gregory.p.smith | 2007-03-17 15:33:35 -0700 (Sat, 17 Mar 2007) | 2 lines
    
      move note to the correct section
    ........
      r54426 | georg.brandl | 2007-03-18 01:25:00 -0700 (Sun, 18 Mar 2007) | 2 lines
    
      Patch #1682878: the new socket methods are recv_into and recvfrom_into, not *_buf.
    ........
      r54432 | georg.brandl | 2007-03-18 11:28:25 -0700 (Sun, 18 Mar 2007) | 2 lines
    
      Patch #1678339: test case for bug in difflib.
    ........
      r54439 | collin.winter | 2007-03-19 11:52:08 -0700 (Mon, 19 Mar 2007) | 1 line
    
      Patch #1630118: add a SpooledTemporaryFile class to tempfile.
    ........
      r54441 | georg.brandl | 2007-03-19 12:02:48 -0700 (Mon, 19 Mar 2007) | 2 lines
    
      Patch #1683328: fixes and enhancements for "unparse" demo.
    ........
      r54456 | neal.norwitz | 2007-03-19 22:07:28 -0700 (Mon, 19 Mar 2007) | 1 line
    
      Add some doc that was left out from some change to platform.py
    ........
      r54457 | neal.norwitz | 2007-03-19 22:08:23 -0700 (Mon, 19 Mar 2007) | 1 line
    
      Add a comment about 3k migration
    ........
      r54458 | neal.norwitz | 2007-03-19 22:21:21 -0700 (Mon, 19 Mar 2007) | 1 line
    
      Get rid of deprecation warning when testing commands.getstatus()
    ........
      r54459 | neal.norwitz | 2007-03-19 22:23:09 -0700 (Mon, 19 Mar 2007) | 4 lines
    
      Try backing out 54407 to see if it corrects the problems on the Windows
      buildbots.  This rev was backported, so we will need to keep both branches
      in sync, pending the outcome of the test after this checkin.
    ........
      r54460 | neal.norwitz | 2007-03-19 23:13:25 -0700 (Mon, 19 Mar 2007) | 1 line
    
      Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail).  Should be backported (assuming it works :-)
    ........
      r54461 | neal.norwitz | 2007-03-19 23:16:26 -0700 (Mon, 19 Mar 2007) | 1 line
    
      Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail).  Should be backported (assuming it works :-)
    ........
      r54462 | neal.norwitz | 2007-03-19 23:53:17 -0700 (Mon, 19 Mar 2007) | 5 lines
    
      Try to be a little more resilient to errors.  This might help the test
      pass, but my guess is that it won't.  I'm guessing that some other
      test is leaving this file open which means it can't be removed
      under Windows AFAIK.
    ........
      r54463 | neal.norwitz | 2007-03-20 01:14:57 -0700 (Tue, 20 Mar 2007) | 8 lines
    
      Try to get test_urllib to pass on Windows by closing the file.
      I'm guessing that's the problem.  h.getfile() must be called *after*
      h.getreply() and the fp can be None.
    
      I'm not entirely convinced this is the best fix (or even correct).
      The buildbots will tell us if things improve or not.  I don't
      know if this needs to be backported (assuming it actually works).
    ........
      r54465 | raymond.hettinger | 2007-03-20 14:27:24 -0700 (Tue, 20 Mar 2007) | 1 line
    
      Extend work on rev 52962 and 53829 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability.
    ........
      r54468 | georg.brandl | 2007-03-20 16:05:14 -0700 (Tue, 20 Mar 2007) | 2 lines
    
      Fix for glob.py if filesystem encoding is None.
    ........
      r54479 | neal.norwitz | 2007-03-20 23:39:48 -0700 (Tue, 20 Mar 2007) | 1 line
    
      Remove unused file spotted by Paul Hankin
    ........
      r54480 | georg.brandl | 2007-03-21 02:00:39 -0700 (Wed, 21 Mar 2007) | 3 lines
    
      Patch #1682205: a TypeError while unpacking an iterable is no longer
      masked by a generic one with the message "unpack non-sequence".
    ........
      r54482 | georg.brandl | 2007-03-21 02:10:29 -0700 (Wed, 21 Mar 2007) | 2 lines
    
      New test for rev. 54407 which only uses directories under TESTFN.
    ........
      r54483 | georg.brandl | 2007-03-21 02:16:53 -0700 (Wed, 21 Mar 2007) | 2 lines
    
      Patch #1684834: document some utility C API functions.
    ........
      r54485 | georg.brandl | 2007-03-21 04:51:25 -0700 (Wed, 21 Mar 2007) | 2 lines
    
      Fix #1684254: split BROWSER contents with shlex to avoid displaying 'URL'.
    ........
      r54487 | andrew.kuchling | 2007-03-21 07:32:43 -0700 (Wed, 21 Mar 2007) | 1 line
    
      Add comments on maintenance of this file
    ........
      r54489 | andrew.kuchling | 2007-03-21 09:57:32 -0700 (Wed, 21 Mar 2007) | 1 line
    
      Fix sentence, and fix typo in example
    ........
      r54490 | andrew.kuchling | 2007-03-21 09:59:20 -0700 (Wed, 21 Mar 2007) | 1 line
    
      Put code examples at left margin instead of indenting them
    ........
      r54491 | facundo.batista | 2007-03-21 12:41:24 -0700 (Wed, 21 Mar 2007) | 1 line
    
      Minor clarification, saying that blocking means no timeout (from bug #882297)
    ........
      r54492 | ziga.seilnacht | 2007-03-21 13:07:56 -0700 (Wed, 21 Mar 2007) | 2 lines
    
      Bug #1675967: re patterns pickled with older Python versions can
      now be unpickled. Will backport.
    ........
      r54495 | raymond.hettinger | 2007-03-21 13:33:57 -0700 (Wed, 21 Mar 2007) | 1 line
    
      Add test and fix for fromkeys() optional argument.
    ........
      r54524 | georg.brandl | 2007-03-22 01:05:45 -0700 (Thu, 22 Mar 2007) | 2 lines
    
      Bug #1685704: use -m switch in timeit docs.
    ........
      r54533 | thomas.heller | 2007-03-22 12:44:31 -0700 (Thu, 22 Mar 2007) | 5 lines
    
      Back out "Patch #1643874: memory leak in ctypes fixed."
    
      The code in this patch leaves no way to give up the ownership of a
      BSTR instance.
    ........
      r54538 | thomas.heller | 2007-03-22 13:34:37 -0700 (Thu, 22 Mar 2007) | 2 lines
    
      Explain the purpose of the b_needsfree flag (forward ported from release25-maint).
    ........
      r54539 | guido.van.rossum | 2007-03-22 21:58:42 -0700 (Thu, 22 Mar 2007) | 12 lines
    
      - Bug #1683368: The object.__init__() and object.__new__() methods are
        now stricter in rejecting excess arguments.  The only time when
        either allows excess arguments is when it is not overridden and the
        other one is.  For backwards compatibility, when both are
        overridden, it is a deprecation warning (for now; maybe a Py3k
        warning later).
    
      When merging this into 3.0, the warnings should become errors.
    
      Note: without the change to string.py, lots of spurious warnings happen.
      What's going on there?
    ........
      r54540 | neal.norwitz | 2007-03-22 22:17:23 -0700 (Thu, 22 Mar 2007) | 1 line
    
      Add Mark Dickinson for SF # 1675423.
    ........
      r54541 | martin.v.loewis | 2007-03-23 03:35:49 -0700 (Fri, 23 Mar 2007) | 3 lines
    
      Patch #1686451: Fix return type for PySequence_{Count,Index,Fast_GET_SIZE}.
      Will backport.
    ........
      r54543 | martin.v.loewis | 2007-03-23 06:27:15 -0700 (Fri, 23 Mar 2007) | 3 lines
    
      Bug #978833: Revert r50844, as it broke _socketobject.dup.
      Will backport.
    ........
      r54545 | guido.van.rossum | 2007-03-23 11:53:03 -0700 (Fri, 23 Mar 2007) | 8 lines
    
      Add a type.__init__() method that enforces the same signature as
      type.__new__(), and then calls object.__init__(cls), just to be anal.
    
      This allows us to restore the code in string.py's _TemplateMetaclass
      that called super(...).__init__(name, bases, dct), which I commented
      out yesterday since it broke due to the stricter argument checking
      added to object.__init__().
    ........
      r54546 | facundo.batista | 2007-03-23 11:54:07 -0700 (Fri, 23 Mar 2007) | 4 lines
    
    
      Added a 'create_connect()' function to socket.py, which creates a
      connection with an optional timeout, and modified httplib.py to
      use this function in HTTPConnection. Applies patch 1676823.
    ........
      r54547 | guido.van.rossum | 2007-03-23 12:39:01 -0700 (Fri, 23 Mar 2007) | 2 lines
    
      Add note about type.__init__().
    ........
      r54553 | thomas.heller | 2007-03-23 12:55:27 -0700 (Fri, 23 Mar 2007) | 5 lines
    
      Prevent creation (followed by a segfault) of array types when the size
      overflows the valid Py_ssize_t range.  Check return values of
      PyMem_Malloc.
    
      Will backport to release25-maint.
    ........
      r54555 | facundo.batista | 2007-03-23 13:23:08 -0700 (Fri, 23 Mar 2007) | 6 lines
    
    
      Surrounded with try/finally to socket's default timeout setting
      changes in the tests, so failing one test won't produce strange
      results in others. Also relaxed the timeout settings in the test
      (where actually the value didn't mean anything).
    ........
      r54556 | collin.winter | 2007-03-23 15:24:39 -0700 (Fri, 23 Mar 2007) | 1 line
    
      Make test_relpath() pass on Windows.
    ........
      r54559 | ziga.seilnacht | 2007-03-24 07:24:26 -0700 (Sat, 24 Mar 2007) | 6 lines
    
      Patch #1489771: update syntax rules in Python Reference Manual.
      Python 2.5 added support for explicit relative import statements and
      yield expressions, which were missing in the manual.
      Also fix grammar productions that used the names from the Grammar file,
      markup that broke the generated grammar.txt, and wrap some lines that
      broke the pdf output.  Will backport.
    ........
      r54565 | georg.brandl | 2007-03-24 15:20:34 -0700 (Sat, 24 Mar 2007) | 2 lines
    
      Remove typo accent.
    ........
      r54566 | georg.brandl | 2007-03-24 15:27:56 -0700 (Sat, 24 Mar 2007) | 2 lines
    
      Revert accidental change.
    ........
      r54567 | brett.cannon | 2007-03-24 18:32:36 -0700 (Sat, 24 Mar 2007) | 3 lines
    
      Change the docs to no longer claim that unittest is preferred over doctest for
      regression tests.
    ........
      r54568 | facundo.batista | 2007-03-24 18:53:21 -0700 (Sat, 24 Mar 2007) | 4 lines
    
    
      Redone the tests, using the infrastructure already present
      for threading and socket serving.
    ........
      r54570 | facundo.batista | 2007-03-24 20:20:05 -0700 (Sat, 24 Mar 2007) | 3 lines
    
    
      Closing the HTTP connection after each test, and listening more.
    ........
      r54572 | georg.brandl | 2007-03-25 11:44:35 -0700 (Sun, 25 Mar 2007) | 2 lines
    
      Markup fix.
    ........
      r54573 | georg.brandl | 2007-03-25 12:04:55 -0700 (Sun, 25 Mar 2007) | 2 lines
    
      Markup fix.
    ........
      r54580 | facundo.batista | 2007-03-26 13:18:31 -0700 (Mon, 26 Mar 2007) | 5 lines
    
    
      Added an optional timeout to FTP class. Also I started a test_ftplib.py
      file to test the ftp lib (right now I included a basic test, the timeout
      one, and nothing else).
    ........
      r54581 | georg.brandl | 2007-03-26 13:28:28 -0700 (Mon, 26 Mar 2007) | 2 lines
    
      Some nits.
    ........
      r54582 | facundo.batista | 2007-03-26 13:56:09 -0700 (Mon, 26 Mar 2007) | 4 lines
    
    
      Forgot to add the file before the previous commit, here go
      the ftplib tests.
    ........
      r54585 | facundo.batista | 2007-03-27 11:23:21 -0700 (Tue, 27 Mar 2007) | 5 lines
    
    
      Added an optional timeout to poplib.POP3. Also created a
      test_poplib.py file with a basic test and the timeout
      ones. Docs are also updated.
    ........
      r54586 | facundo.batista | 2007-03-27 11:50:29 -0700 (Tue, 27 Mar 2007) | 3 lines
    
    
      The basic test cases of poplib.py.
    ........
      r54594 | facundo.batista | 2007-03-27 20:45:20 -0700 (Tue, 27 Mar 2007) | 4 lines
    
    
      Bug 1688393. Adds a control of negative values in
      socket.recvfrom, which caused an ugly crash.
    ........
      r54599 | facundo.batista | 2007-03-28 11:25:54 -0700 (Wed, 28 Mar 2007) | 5 lines
    
    
      Added timeout to smtplib (to SMTP and SMTP_SSL). Also created
      the test_smtplib.py file, with a basic test and the timeout
      ones. Docs are updated too.
    ........
      r54603 | collin.winter | 2007-03-28 16:34:06 -0700 (Wed, 28 Mar 2007) | 3 lines
    
      Consolidate patches #1690164, 1683397, and 1690169, all of which refactor XML-related test suites. The patches are applied together because they use a common output/xmltests file.
      Thanks to Jerry Seutter for all three patches.
    ........
      r54604 | collin.winter | 2007-03-28 19:28:16 -0700 (Wed, 28 Mar 2007) | 1 line
    
      Make test_zipfile clean up its temporary files properly.
    ........
      r54605 | georg.brandl | 2007-03-29 00:41:32 -0700 (Thu, 29 Mar 2007) | 2 lines
    
      These are actually methods.
    ........
      r54606 | georg.brandl | 2007-03-29 05:42:07 -0700 (Thu, 29 Mar 2007) | 4 lines
    
      In Windows' time.clock(), when QueryPerformanceFrequency() fails,
      the C lib's clock() is used, but it must be divided by CLOCKS_PER_SEC
      as for the POSIX implementation (thanks to #pypy).
    ........
      r54608 | facundo.batista | 2007-03-29 11:22:35 -0700 (Thu, 29 Mar 2007) | 5 lines
    
    
      Added timout parameter to telnetlib.Telnet. Also created
      test_telnetlib.py with a basic test and timeout ones.
      Docs are also updated.
    ........
      r54613 | facundo.batista | 2007-03-30 06:00:35 -0700 (Fri, 30 Mar 2007) | 4 lines
    
    
      Added the posibility to pass the timeout to FTP.connect, not only when
      instantiating the class. Docs and tests are updated.
    ........
      r54614 | collin.winter | 2007-03-30 07:01:25 -0700 (Fri, 30 Mar 2007) | 1 line
    
      Bug #1688274: add documentation for C-level class objects.
    ........
      r54615 | marc-andre.lemburg | 2007-03-30 08:01:42 -0700 (Fri, 30 Mar 2007) | 4 lines
    
      Bump the patch level version of distutils since there were a few bug fixes since
      the 2.5.0 release.
    ........
      r54617 | georg.brandl | 2007-03-30 08:49:05 -0700 (Fri, 30 Mar 2007) | 2 lines
    
      Markup fix.
    ........
      r54618 | georg.brandl | 2007-03-30 10:39:39 -0700 (Fri, 30 Mar 2007) | 2 lines
    
      Label name fix.
    ........
      r54619 | georg.brandl | 2007-03-30 10:47:21 -0700 (Fri, 30 Mar 2007) | 2 lines
    
      Duplicate label fix.
    ........
      r54620 | georg.brandl | 2007-03-30 10:48:39 -0700 (Fri, 30 Mar 2007) | 2 lines
    
      Markup fix.
    ........
      r54623 | andrew.kuchling | 2007-03-30 11:00:15 -0700 (Fri, 30 Mar 2007) | 1 line
    
      Add item.  (Oops, accidentally checked this in on my branch)
    ........
      r54624 | georg.brandl | 2007-03-30 12:01:38 -0700 (Fri, 30 Mar 2007) | 2 lines
    
      Duplicate label fix.
    ........
      r54625 | georg.brandl | 2007-03-30 12:14:02 -0700 (Fri, 30 Mar 2007) | 2 lines
    
      Markup fix.
    ........
      r54629 | georg.brandl | 2007-03-31 03:17:31 -0700 (Sat, 31 Mar 2007) | 2 lines
    
      repair string literal.
    ........
      r54630 | georg.brandl | 2007-03-31 04:54:58 -0700 (Sat, 31 Mar 2007) | 2 lines
    
      Markup fix.
    ........
      r54631 | georg.brandl | 2007-03-31 04:58:36 -0700 (Sat, 31 Mar 2007) | 2 lines
    
      Duplicate label fix.
    ........
      r54632 | georg.brandl | 2007-03-31 04:59:54 -0700 (Sat, 31 Mar 2007) | 2 lines
    
      Typo fix.
    ........
      r54633 | neal.norwitz | 2007-03-31 11:54:18 -0700 (Sat, 31 Mar 2007) | 1 line
    
      Fix method names.  Will backport.
    ........
      r54634 | georg.brandl | 2007-03-31 11:56:11 -0700 (Sat, 31 Mar 2007) | 4 lines
    
      Bug #1655392: don't add -L/usr/lib/pythonX.Y/config to the LDFLAGS
      returned by python-config if Python was built with --enable-shared
      because that prevented the shared library from being used.
    ........
      r54637 | collin.winter | 2007-03-31 12:31:34 -0700 (Sat, 31 Mar 2007) | 1 line
    
      Shut up an occaisonal buildbot error due to test files being left around.
    ........
      r54644 | neal.norwitz | 2007-04-01 11:24:22 -0700 (Sun, 01 Apr 2007) | 11 lines
    
      SF #1685563, MSVCCompiler creates redundant and long PATH strings
    
      If MSVCCompiler.initialize() was called multiple times, the path
      would get duplicated.  On Windows, this is a problem because the
      path is limited to 4k.  There's no benefit in adding a path multiple
      times, so prevent that from occuring.  We also normalize the path
      before checking for duplicates so things like /a and /a/ won't both
      be stored.
    
      Will backport.
    ........
      r54646 | brett.cannon | 2007-04-01 11:47:27 -0700 (Sun, 01 Apr 2007) | 8 lines
    
      time.strptime's caching of its locale object was being recreated when the
      locale changed but not used during the function call it was recreated during.
    
      The test in this checkin is untested (OS X does not have the proper locale
      support for me to test), although the fix for the bug this deals with
      was tested by the OP (#1290505).  Once the buildbots verify the test at least
      doesn't fail it becomes a backport candidate.
    ........
      r54647 | brett.cannon | 2007-04-01 12:46:19 -0700 (Sun, 01 Apr 2007) | 3 lines
    
      Fix the test for recreating the locale cache object by not worrying about if
      one of the test locales cannot be set.
    ........
      r54649 | georg.brandl | 2007-04-01 14:29:15 -0700 (Sun, 01 Apr 2007) | 2 lines
    
      Fix a lot of markup and meta-information glitches.
    ........
      r54650 | georg.brandl | 2007-04-01 14:39:52 -0700 (Sun, 01 Apr 2007) | 2 lines
    
      Another fix.
    ........
      r54651 | georg.brandl | 2007-04-01 15:39:10 -0700 (Sun, 01 Apr 2007) | 2 lines
    
      Lots of explicit class names for method and member descs.
    ........
      r54652 | georg.brandl | 2007-04-01 15:40:12 -0700 (Sun, 01 Apr 2007) | 2 lines
    
      Explicit class names.
    ........
      r54653 | georg.brandl | 2007-04-01 15:47:31 -0700 (Sun, 01 Apr 2007) | 2 lines
    
      Some semantic fixes.
    ........
      r54654 | georg.brandl | 2007-04-01 16:29:10 -0700 (Sun, 01 Apr 2007) | 2 lines
    
      Remove bogus entry.
    ........
      r54655 | georg.brandl | 2007-04-01 16:31:30 -0700 (Sun, 01 Apr 2007) | 2 lines
    
      Fix the class name of strings.
    ........
      r54658 | raymond.hettinger | 2007-04-02 10:29:30 -0700 (Mon, 02 Apr 2007) | 1 line
    
      SF #1693079:  Cannot save empty array in shelve
    ........
      r54663 | raymond.hettinger | 2007-04-02 15:54:21 -0700 (Mon, 02 Apr 2007) | 3 lines
    
      Array module's buffer interface can now handle empty arrays.
    ........
      r54664 | guido.van.rossum | 2007-04-02 16:55:37 -0700 (Mon, 02 Apr 2007) | 5 lines
    
      Fix warnings about object.__init__() signature.
      Two (test_array and test_descr) were bug IMO; the third (copy_reg)
      is a work-around which recognizes that object.__init__() doesn't do
      anything.
    ........
      r54666 | raymond.hettinger | 2007-04-02 17:02:11 -0700 (Mon, 02 Apr 2007) | 1 line
    
      SF 1602378 Clarify docstrings for bisect
    ........
      r54668 | raymond.hettinger | 2007-04-02 18:39:43 -0700 (Mon, 02 Apr 2007) | 3 lines
    
      SF #1382213:  Tutorial section 9.5.1 ignores MRO for new-style classes
    ........
      r54669 | matthias.klose | 2007-04-02 21:35:59 -0700 (Mon, 02 Apr 2007) | 4 lines
    
      - Fix an off-by-one bug in locale.strxfrm().
    
        patch taken from http://bugs.debian.org/416934.
    ........
      r54671 | georg.brandl | 2007-04-03 00:04:27 -0700 (Tue, 03 Apr 2007) | 9 lines
    
      Fix the strange case of
    
      \begin{methoddesc}[NNTP]{...}
    
      where
    
      \ifx#1\@undefined ended up comparing N and N, therefore executing
      the true part of the conditional, blowing up at \@undefined.
    ........
      r54672 | facundo.batista | 2007-04-03 07:05:08 -0700 (Tue, 03 Apr 2007) | 4 lines
    
    
      Now using unittest for the tests infraestructure. Also split the
      tests in those who need the network, and that who doesn't.
    ........
      r54673 | walter.doerwald | 2007-04-03 09:08:10 -0700 (Tue, 03 Apr 2007) | 4 lines
    
      Move the functionality for catching warnings in test_warnings.py into a separate
      class to that reusing the functionality in test_structmembers.py doesn't rerun
      the tests from test_warnings.py.
    ........
      r54674 | walter.doerwald | 2007-04-03 09:16:24 -0700 (Tue, 03 Apr 2007) | 2 lines
    
      Document that CatchWarningTests is reused by test_structmembers.py.
    ........
      r54675 | walter.doerwald | 2007-04-03 09:53:43 -0700 (Tue, 03 Apr 2007) | 4 lines
    
      Add tests for the filename.
    
      Test that the stacklevel is handled correctly.
    ........
      r54676 | facundo.batista | 2007-04-03 10:29:48 -0700 (Tue, 03 Apr 2007) | 6 lines
    
    
      Added a SSL server to test_socket_ssl.py to be able to test
      locally. Now, it checks if have openssl available and run
      those specific tests (it starts openssl at the beggining of
      all the tests and then kills it at the end).
    ........
      r54677 | walter.doerwald | 2007-04-03 11:33:29 -0700 (Tue, 03 Apr 2007) | 6 lines
    
      Implement a contextmanager test.test_support.catch_warning that can
      be used to catch the last warning issued by the warning framework.
    
      Change test_warnings.py and test_structmembers.py to use this
      new contextmanager.
    ........
      r54678 | facundo.batista | 2007-04-03 14:15:34 -0700 (Tue, 03 Apr 2007) | 4 lines
    
    
      Changed the whole structure of startup and checking if the
      server is available. Hope to not get more false alarms.
    ........
      r54681 | facundo.batista | 2007-04-04 07:10:40 -0700 (Wed, 04 Apr 2007) | 4 lines
    
    
      Fixed the way that the .pem files are looked for, and changed
      how to kill the process in win32 to use the _handle attribute.
    ........
      r54682 | guido.van.rossum | 2007-04-04 10:43:02 -0700 (Wed, 04 Apr 2007) | 4 lines
    
      Fix a race condition in this test -- instead of assuming that it will take
      the test server thread at most 0.5 seconds to get ready, use an event
      variable.
    ........
      r54683 | collin.winter | 2007-04-04 11:14:17 -0700 (Wed, 04 Apr 2007) | 1 line
    
      Clean up imports.
    ........
      r54684 | collin.winter | 2007-04-04 11:16:24 -0700 (Wed, 04 Apr 2007) | 1 line
    
      Stop using test_support.verify().
    ........
      r54685 | martin.v.loewis | 2007-04-04 11:30:36 -0700 (Wed, 04 Apr 2007) | 2 lines
    
      Bug #1686475: Support stat'ing open files on Windows again.
      Will backport to 2.5.
    ........
      r54687 | collin.winter | 2007-04-04 11:33:40 -0700 (Wed, 04 Apr 2007) | 1 line
    
      Make test_getopt use unittest.
    ........
      r54688 | collin.winter | 2007-04-04 11:36:30 -0700 (Wed, 04 Apr 2007) | 1 line
    
      Make test_softspace use unittest.
    ........
      r54689 | ziga.seilnacht | 2007-04-04 11:38:47 -0700 (Wed, 04 Apr 2007) | 2 lines
    
      Fix WalkTests.test_traversal() on Windows.  The cleanup in
      MakedirTests.setUp() can now be removed.
    ........
      r54695 | raymond.hettinger | 2007-04-05 11:00:03 -0700 (Thu, 05 Apr 2007) | 3 lines
    
      Bug #1563759: struct.unpack doens't support buffer protocol objects
    ........
      r54697 | collin.winter | 2007-04-05 13:05:07 -0700 (Thu, 05 Apr 2007) | 1 line
    
      Convert test_long_future to use unittest.
    ........
      r54698 | collin.winter | 2007-04-05 13:08:56 -0700 (Thu, 05 Apr 2007) | 1 line
    
      Convert test_normalization to use unittest.
    ........
      r54699 | andrew.kuchling | 2007-04-05 18:11:58 -0700 (Thu, 05 Apr 2007) | 1 line
    
      Some grammar fixes
    ........
      r54704 | collin.winter | 2007-04-06 12:27:40 -0700 (Fri, 06 Apr 2007) | 1 line
    
      Convert test_stringprep to use unittest.
    ........
      r54705 | collin.winter | 2007-04-06 12:32:32 -0700 (Fri, 06 Apr 2007) | 1 line
    
      Import cleanup in test_crypt.
    ........
      r54706 | collin.winter | 2007-04-06 13:00:05 -0700 (Fri, 06 Apr 2007) | 1 line
    
      Convert test_gc to use unittest.
    ........
      r54707 | collin.winter | 2007-04-06 13:03:11 -0700 (Fri, 06 Apr 2007) | 1 line
    
      Convert test_module to use unittest.
    ........
      r54711 | collin.winter | 2007-04-06 21:40:43 -0700 (Fri, 06 Apr 2007) | 1 line
    
      Convert test_fileinput to use unittest.
    ........
      r54712 | brett.cannon | 2007-04-07 21:29:32 -0700 (Sat, 07 Apr 2007) | 5 lines
    
      Doc that file.next() has undefined behaviour when called on a file opened with
      'w'.  Closes bug #1569057.
    
      To be backported once 2.5 branch is unfrozen.
    ........
      r54726 | vinay.sajip | 2007-04-09 09:16:10 -0700 (Mon, 09 Apr 2007) | 1 line
    
      Added optional timeout to SocketHandler.makeSocket (SF #1695948)
    ........
      r54727 | ziga.seilnacht | 2007-04-09 12:10:29 -0700 (Mon, 09 Apr 2007) | 3 lines
    
      Patch #1695862: remove old test directory that causes test_urllib failures
      on Windows buildbots.  The change is a one time fix and will be removed
      after a successful buildbot run.
    ........
      r54729 | facundo.batista | 2007-04-09 20:00:37 -0700 (Mon, 09 Apr 2007) | 3 lines
    
    
      Minor fix to the tests pass ok even with -O.
    ........
      r54730 | collin.winter | 2007-04-09 21:44:49 -0700 (Mon, 09 Apr 2007) | 1 line
    
      Typo fix.
    ........
      r54732 | facundo.batista | 2007-04-10 05:58:45 -0700 (Tue, 10 Apr 2007) | 5 lines
    
    
      General clean-up. Lot of margin corrections, comments, some typos.
      Exceptions now are raised in the new style. And a mockup class is
      now also new style. Thanks Santiago Pereson.
    ........
      r54741 | georg.brandl | 2007-04-10 14:39:38 -0700 (Tue, 10 Apr 2007) | 2 lines
    
      Repair a duplicate label and some obsolete uses of \setindexsubitem.
    ........
      r54746 | andrew.kuchling | 2007-04-11 06:39:00 -0700 (Wed, 11 Apr 2007) | 1 line
    
      Add window.chgat() method, submitted via e-mail by Fabian Kreutz
    ........
      r54747 | andrew.kuchling | 2007-04-11 06:42:25 -0700 (Wed, 11 Apr 2007) | 1 line
    
      Point readers at the patch submission instructions
    ........
      r54748 | andrew.kuchling | 2007-04-11 06:47:13 -0700 (Wed, 11 Apr 2007) | 1 line
    
      Describe undocumented third argument to touchline()
    ........
      r54757 | georg.brandl | 2007-04-11 10:16:24 -0700 (Wed, 11 Apr 2007) | 3 lines
    
      Add some missing NULL checks which trigger crashes on low-memory conditions.
      Found by Victor Stinner. Will backport when 2.5 branch is unfrozen.
    ........
      r54760 | raymond.hettinger | 2007-04-11 11:40:58 -0700 (Wed, 11 Apr 2007) | 1 line
    
      SF 1191699:  Make slices picklable
    ........
      r54762 | georg.brandl | 2007-04-11 12:25:11 -0700 (Wed, 11 Apr 2007) | 2 lines
    
      Exceptions are no longer old-style instances. Fix accordingly.
    ........
      r54763 | georg.brandl | 2007-04-11 16:28:44 -0700 (Wed, 11 Apr 2007) | 2 lines
    
      Repair missing spaces after \UNIX.
    ........
      r54772 | raymond.hettinger | 2007-04-11 21:10:00 -0700 (Wed, 11 Apr 2007) | 1 line
    
      SF 1193128:  Let str.translate(None) be an identity transformation
    ........
      r54784 | georg.brandl | 2007-04-12 00:01:19 -0700 (Thu, 12 Apr 2007) | 2 lines
    
      Patch #1698951: clarify deprecation message in rexec and Bastion
    ........
      r54785 | ziga.seilnacht | 2007-04-12 01:46:51 -0700 (Thu, 12 Apr 2007) | 2 lines
    
      Patch #1695862: remove the cleanup code, now that Windows buildbots are green
      again.
    ........
      r54786 | walter.doerwald | 2007-04-12 03:35:00 -0700 (Thu, 12 Apr 2007) | 3 lines
    
      Fix utf-8-sig incremental decoder, which didn't recognise a BOM when the
      first chunk fed to the decoder started with a BOM, but was longer than 3 bytes.
    ........
      r54807 | barry.warsaw | 2007-04-13 11:47:14 -0700 (Fri, 13 Apr 2007) | 8 lines
    
      Port r54805 from python25-maint branch:
    
      Add code to read from master_fd in the parent, breaking when we get an OSError
      (EIO can occur on Linux) or there's no more data to read.  Without this,
      test_pty.py can hang on the waitpid() because the child is blocking on the
      stdout write.  This will definitely happen on Mac OS X and could potentially
      happen on other platforms.  See the comment for details.
    ........
      r54812 | kristjan.jonsson | 2007-04-13 15:07:33 -0700 (Fri, 13 Apr 2007) | 1 line
    
      Fix a bug when using the __lltrace__ opcode tracer, and a problem sith signed chars in frameobject.c which can occur with opcodes > 127
    ........
      r54814 | kristjan.jonsson | 2007-04-13 15:20:13 -0700 (Fri, 13 Apr 2007) | 1 line
    
      Fix potential crash in path manipulation on windows
    ........
      r54816 | trent.mick | 2007-04-13 16:22:05 -0700 (Fri, 13 Apr 2007) | 4 lines
    
      Add the necessary dependency for the Windows VC6 build to ensure 'pythoncore'
      is built before '_ctypes' is attempted.
      Will backport to 2.5 once it is unfrozen for 2.5.1.
    ........
      r54825 | neal.norwitz | 2007-04-13 22:25:50 -0700 (Fri, 13 Apr 2007) | 3 lines
    
      When __slots__ are set to a unicode string, make it work the same as
      setting a plain string, ie don't expand to single letter identifiers.
    ........
      r54841 | neal.norwitz | 2007-04-16 00:37:55 -0700 (Mon, 16 Apr 2007) | 1 line
    
      SF #1701207, Fix bogus assertion (and test it!)
    ........
      r54844 | collin.winter | 2007-04-16 15:10:32 -0700 (Mon, 16 Apr 2007) | 1 line
    
      Check the availability of the urlfetch resource earlier than before.
    ........
      r54849 | martin.v.loewis | 2007-04-16 22:02:01 -0700 (Mon, 16 Apr 2007) | 2 lines
    
      Add Travis Oliphant.
    ........
      r54873 | brett.cannon | 2007-04-18 20:44:17 -0700 (Wed, 18 Apr 2007) | 2 lines
    
      Silence a compiler warning about incompatible pointer types.
    ........
      r54874 | neal.norwitz | 2007-04-18 22:52:37 -0700 (Wed, 18 Apr 2007) | 2 lines
    
      SF #1703270, add missing declaration in readline.c to avoid compiler warning.
    ........
      r54875 | armin.rigo | 2007-04-19 07:44:48 -0700 (Thu, 19 Apr 2007) | 8 lines
    
      Revert r53997 as per
      http://mail.python.org/pipermail/python-dev/2007-March/071796.html .
    
      I've kept a couple of still-valid extra tests in test_descr, but didn't
      bother to sort through the new comments and refactorings added in r53997
      to see if some of them could be kept.  If so, they could go in a
      follow-up check-in.
    ........
      r54876 | armin.rigo | 2007-04-19 07:56:48 -0700 (Thu, 19 Apr 2007) | 2 lines
    
      Fix a usage of the dangerous pattern decref - modify field - incref.
    ........
      r54884 | neal.norwitz | 2007-04-19 22:20:38 -0700 (Thu, 19 Apr 2007) | 9 lines
    
      Add an optional address to copy the failure mails to.
    
      Detect a conflict in the only file that should have outstanding changes
      when this script is run.  This doesn't matter on the trunk, but does
      when run on a branch.  Trunk always has the date set to today in
      boilerplate.tex.  Each time a release is cut with a different date,
      a conflict occurs.  (We could copy a known good version, but then
      we would lose changes to this file.)
    ........
      r54918 | georg.brandl | 2007-04-21 13:35:38 -0700 (Sat, 21 Apr 2007) | 3 lines
    
      Bug #1704790: bind name "sys" locally in __del__ method so that it is
      not cleared before __del__ is run.
    ........
      r54920 | facundo.batista | 2007-04-21 18:18:56 -0700 (Sat, 21 Apr 2007) | 5 lines
    
    
      Added tests for other methods of SSL object. Now we cover
      all the object methods. This is the final step to close
      the #451607 bug.
    ........
      r54927 | facundo.batista | 2007-04-23 10:08:31 -0700 (Mon, 23 Apr 2007) | 5 lines
    
    
      As specified in RFC 2616, 2xx code indicates that the client's
      request was successfully received, understood, and accepted.
      Now in these cases no error is raised. Also fixed tests.
    ........
      r54929 | collin.winter | 2007-04-23 20:43:46 -0700 (Mon, 23 Apr 2007) | 1 line
    
      Convert PyUnit -> unittest.
    ........
      r54931 | collin.winter | 2007-04-23 21:09:52 -0700 (Mon, 23 Apr 2007) | 1 line
    
      Remove code that hasn't been called in years.
    ........
      r54932 | neal.norwitz | 2007-04-23 21:53:12 -0700 (Mon, 23 Apr 2007) | 1 line
    
      Fix SF #1703110, Incorrect example for add_password() (use uri, not host)
    ........
      r54934 | georg.brandl | 2007-04-24 03:36:42 -0700 (Tue, 24 Apr 2007) | 2 lines
    
      Some new year updates.
    ........
      r54938 | facundo.batista | 2007-04-24 06:54:38 -0700 (Tue, 24 Apr 2007) | 4 lines
    
    
      Added a comment about last change in urllib2.py (all 2xx responses
      are ok now).
    ........
      r54939 | georg.brandl | 2007-04-24 08:10:09 -0700 (Tue, 24 Apr 2007) | 2 lines
    
      Bug #1705717: error in sys.argv docs.
    ........
      r54941 | georg.brandl | 2007-04-24 08:27:13 -0700 (Tue, 24 Apr 2007) | 4 lines
    
      Bug #1706381: Specifying the SWIG option "-c++" in the setup.py file
      (as opposed to the command line) will now write file names ending in
      ".cpp" too.
    ........
      r54944 | raymond.hettinger | 2007-04-24 15:13:43 -0700 (Tue, 24 Apr 2007) | 1 line
    
      Fix markup
    ........
      r54945 | kristjan.jonsson | 2007-04-24 17:10:50 -0700 (Tue, 24 Apr 2007) | 1 line
    
      Merge change 54909 from release25-maint:  Fix several minor issues discovered using code analysis in VisualStudio 2005 Team Edition
    ........
      r54947 | kristjan.jonsson | 2007-04-24 17:17:39 -0700 (Tue, 24 Apr 2007) | 1 line
    
      Make pythoncore compile cleanly with VisualStudio 2005.  Used an explicit typecast to get a 64 bit integer, and undefined the Yield macro that conflicts with winbase.h
    ........
      r54948 | kristjan.jonsson | 2007-04-24 17:19:26 -0700 (Tue, 24 Apr 2007) | 1 line
    
      Remove obsolete comment. Importing of .dll files has been discontinued, only .pyd files supported on windows now.
    ........
      r54949 | georg.brandl | 2007-04-24 23:24:59 -0700 (Tue, 24 Apr 2007) | 2 lines
    
      Patch #1698768: updated the "using Python on the Mac" intro.
    ........
      r54951 | georg.brandl | 2007-04-24 23:25:55 -0700 (Tue, 24 Apr 2007) | 2 lines
    
      Markup fix.
    ........
      r54953 | neal.norwitz | 2007-04-24 23:30:05 -0700 (Tue, 24 Apr 2007) | 3 lines
    
      Whitespace normalization.  Ugh, we really need to do this more often.
      You might want to review this change as it's my first time.  Be gentle. :-)
    ........
      r54956 | collin.winter | 2007-04-25 10:29:52 -0700 (Wed, 25 Apr 2007) | 1 line
    
      Standardize on test.test_support.run_unittest() (as opposed to a mix of run_unittest() and run_suite()). Also, add functionality to run_unittest() that admits usage of unittest.TestLoader.loadTestsFromModule().
    ........
      r54957 | collin.winter | 2007-04-25 10:37:35 -0700 (Wed, 25 Apr 2007) | 1 line
    
      Remove functionality from test_datetime.test_main() that does reference count checking; 'regrtest.py -R' is the way to do this kind of testing.
    ........
      r54958 | collin.winter | 2007-04-25 10:57:53 -0700 (Wed, 25 Apr 2007) | 1 line
    
      Change test_support.have_unicode to use True/False instead of 1/0.
    ........
      r54959 | tim.peters | 2007-04-25 11:47:18 -0700 (Wed, 25 Apr 2007) | 2 lines
    
      Whitespace normalization.
    ........
      r54960 | tim.peters | 2007-04-25 11:48:35 -0700 (Wed, 25 Apr 2007) | 2 lines
    
      Set missing svn:eol-style property on text files.
    ........
      r54961 | collin.winter | 2007-04-25 11:54:36 -0700 (Wed, 25 Apr 2007) | 1 line
    
      Import and raise statement cleanup.
    ........
      r54969 | collin.winter | 2007-04-25 13:41:34 -0700 (Wed, 25 Apr 2007) | 1 line
    
      Convert test_ossaudiodev to use unittest.
    ........
      r54974 | collin.winter | 2007-04-25 14:50:25 -0700 (Wed, 25 Apr 2007) | 1 line
    
      Fix an issue related to the unittest conversion.
    ........
      r54979 | fred.drake | 2007-04-25 21:42:19 -0700 (Wed, 25 Apr 2007) | 1 line
    
      fix some markup errors
    ........
      r54982 | kristjan.jonsson | 2007-04-26 02:15:08 -0700 (Thu, 26 Apr 2007) | 1 line
    
      Export function sanitize_the_mode from fileobject.c as _PyFile_SanitizeMode().  Use this function in posixmodule.c when implementing fdopen().  This fixes test_subprocess.py for a VisualStudio 2005 compile.
    ........
      r54983 | kristjan.jonsson | 2007-04-26 06:44:16 -0700 (Thu, 26 Apr 2007) | 1 line
    
      The locale "En" appears not to be valid on windows underi VisualStudio.2005.  Added "English" to the test_locale.py to make the testsuite pass for that build
    ........
      r54984 | steve.holden | 2007-04-26 07:23:12 -0700 (Thu, 26 Apr 2007) | 1 line
    
      Minor wording change on slicing aide-memoire.
    ........
      r54985 | kristjan.jonsson | 2007-04-26 08:24:54 -0700 (Thu, 26 Apr 2007) | 1 line
    
      Accomodate 64 bit time_t in the _bsddb module.
    ........
    d8faa365
telnetlib.py 21.3 KB
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659
r"""TELNET client class.

Based on RFC 854: TELNET Protocol Specification, by J. Postel and
J. Reynolds

Example:

>>> from telnetlib import Telnet
>>> tn = Telnet('www.python.org', 79)   # connect to finger port
>>> tn.write('guido\r\n')
>>> print(tn.read_all())
Login       Name               TTY         Idle    When    Where
guido    Guido van Rossum      pts/2        <Dec  2 11:10> snag.cnri.reston..

>>>

Note that read_all() won't read until eof -- it just reads some data
-- but it guarantees to read at least one byte unless EOF is hit.

It is possible to pass a Telnet object to select.select() in order to
wait until more data is available.  Note that in this case,
read_eager() may return '' even if there was data on the socket,
because the protocol negotiation may have eaten the data.  This is why
EOFError is needed in some cases to distinguish between "no data" and
"connection closed" (since the socket also appears ready for reading
when it is closed).

To do:
- option negotiation
- timeout should be intrinsic to the connection object instead of an
  option on one of the read calls only

"""


# Imported modules
import sys
import socket
import select

__all__ = ["Telnet"]

# Tunable parameters
DEBUGLEVEL = 0

# Telnet protocol defaults
TELNET_PORT = 23

# Telnet protocol characters (don't change)
IAC  = chr(255) # "Interpret As Command"
DONT = chr(254)
DO   = chr(253)
WONT = chr(252)
WILL = chr(251)
theNULL = chr(0)

SE  = chr(240)  # Subnegotiation End
NOP = chr(241)  # No Operation
DM  = chr(242)  # Data Mark
BRK = chr(243)  # Break
IP  = chr(244)  # Interrupt process
AO  = chr(245)  # Abort output
AYT = chr(246)  # Are You There
EC  = chr(247)  # Erase Character
EL  = chr(248)  # Erase Line
GA  = chr(249)  # Go Ahead
SB =  chr(250)  # Subnegotiation Begin


# Telnet protocol options code (don't change)
# These ones all come from arpa/telnet.h
BINARY = chr(0) # 8-bit data path
ECHO = chr(1) # echo
RCP = chr(2) # prepare to reconnect
SGA = chr(3) # suppress go ahead
NAMS = chr(4) # approximate message size
STATUS = chr(5) # give status
TM = chr(6) # timing mark
RCTE = chr(7) # remote controlled transmission and echo
NAOL = chr(8) # negotiate about output line width
NAOP = chr(9) # negotiate about output page size
NAOCRD = chr(10) # negotiate about CR disposition
NAOHTS = chr(11) # negotiate about horizontal tabstops
NAOHTD = chr(12) # negotiate about horizontal tab disposition
NAOFFD = chr(13) # negotiate about formfeed disposition
NAOVTS = chr(14) # negotiate about vertical tab stops
NAOVTD = chr(15) # negotiate about vertical tab disposition
NAOLFD = chr(16) # negotiate about output LF disposition
XASCII = chr(17) # extended ascii character set
LOGOUT = chr(18) # force logout
BM = chr(19) # byte macro
DET = chr(20) # data entry terminal
SUPDUP = chr(21) # supdup protocol
SUPDUPOUTPUT = chr(22) # supdup output
SNDLOC = chr(23) # send location
TTYPE = chr(24) # terminal type
EOR = chr(25) # end or record
TUID = chr(26) # TACACS user identification
OUTMRK = chr(27) # output marking
TTYLOC = chr(28) # terminal location number
VT3270REGIME = chr(29) # 3270 regime
X3PAD = chr(30) # X.3 PAD
NAWS = chr(31) # window size
TSPEED = chr(32) # terminal speed
LFLOW = chr(33) # remote flow control
LINEMODE = chr(34) # Linemode option
XDISPLOC = chr(35) # X Display Location
OLD_ENVIRON = chr(36) # Old - Environment variables
AUTHENTICATION = chr(37) # Authenticate
ENCRYPT = chr(38) # Encryption option
NEW_ENVIRON = chr(39) # New - Environment variables
# the following ones come from
# http://www.iana.org/assignments/telnet-options
# Unfortunately, that document does not assign identifiers
# to all of them, so we are making them up
TN3270E = chr(40) # TN3270E
XAUTH = chr(41) # XAUTH
CHARSET = chr(42) # CHARSET
RSP = chr(43) # Telnet Remote Serial Port
COM_PORT_OPTION = chr(44) # Com Port Control Option
SUPPRESS_LOCAL_ECHO = chr(45) # Telnet Suppress Local Echo
TLS = chr(46) # Telnet Start TLS
KERMIT = chr(47) # KERMIT
SEND_URL = chr(48) # SEND-URL
FORWARD_X = chr(49) # FORWARD_X
PRAGMA_LOGON = chr(138) # TELOPT PRAGMA LOGON
SSPI_LOGON = chr(139) # TELOPT SSPI LOGON
PRAGMA_HEARTBEAT = chr(140) # TELOPT PRAGMA HEARTBEAT
EXOPL = chr(255) # Extended-Options-List
NOOPT = chr(0)

class Telnet:

    """Telnet interface class.

    An instance of this class represents a connection to a telnet
    server.  The instance is initially not connected; the open()
    method must be used to establish a connection.  Alternatively, the
    host name and optional port number can be passed to the
    constructor, too.

    Don't try to reopen an already connected instance.

    This class has many read_*() methods.  Note that some of them
    raise EOFError when the end of the connection is read, because
    they can return an empty string for other reasons.  See the
    individual doc strings.

    read_until(expected, [timeout])
        Read until the expected string has been seen, or a timeout is
        hit (default is no timeout); may block.

    read_all()
        Read all data until EOF; may block.

    read_some()
        Read at least one byte or EOF; may block.

    read_very_eager()
        Read all data available already queued or on the socket,
        without blocking.

    read_eager()
        Read either data already queued or some data available on the
        socket, without blocking.

    read_lazy()
        Read all data in the raw queue (processing it first), without
        doing any socket I/O.

    read_very_lazy()
        Reads all data in the cooked queue, without doing any socket
        I/O.

    read_sb_data()
        Reads available data between SB ... SE sequence. Don't block.

    set_option_negotiation_callback(callback)
        Each time a telnet option is read on the input flow, this callback
        (if set) is called with the following parameters :
        callback(telnet socket, command, option)
            option will be chr(0) when there is no option.
        No other action is done afterwards by telnetlib.

    """

    def __init__(self, host=None, port=0, timeout=None):
        """Constructor.

        When called without arguments, create an unconnected instance.
        With a hostname argument, it connects the instance; a port
        number is optional.

        """
        self.debuglevel = DEBUGLEVEL
        self.host = host
        self.port = port
        self.timeout = timeout
        self.sock = None
        self.rawq = ''
        self.irawq = 0
        self.cookedq = ''
        self.eof = 0
        self.iacseq = '' # Buffer for IAC sequence.
        self.sb = 0 # flag for SB and SE sequence.
        self.sbdataq = ''
        self.option_callback = None
        if host is not None:
            self.open(host, port, timeout)

    def open(self, host, port=0, timeout=None):
        """Connect to a host.

        The optional second argument is the port number, which
        defaults to the standard telnet port (23).

        Don't try to reopen an already connected instance.

        """
        self.eof = 0
        if not port:
            port = TELNET_PORT
        self.host = host
        self.port = port
        if timeout is not None:
            self.timeout = timeout
        self.sock = socket.create_connection((host, port), self.timeout)

    def __del__(self):
        """Destructor -- close the connection."""
        self.close()

    def msg(self, msg, *args):
        """Print a debug message, when the debug level is > 0.

        If extra arguments are present, they are substituted in the
        message using the standard string formatting operator.

        """
        if self.debuglevel > 0:
            print('Telnet(%s,%d):' % (self.host, self.port), end=' ')
            if args:
                print(msg % args)
            else:
                print(msg)

    def set_debuglevel(self, debuglevel):
        """Set the debug level.

        The higher it is, the more debug output you get (on sys.stdout).

        """
        self.debuglevel = debuglevel

    def close(self):
        """Close the connection."""
        if self.sock:
            self.sock.close()
        self.sock = 0
        self.eof = 1
        self.iacseq = ''
        self.sb = 0

    def get_socket(self):
        """Return the socket object used internally."""
        return self.sock

    def fileno(self):
        """Return the fileno() of the socket object used internally."""
        return self.sock.fileno()

    def write(self, buffer):
        """Write a string to the socket, doubling any IAC characters.

        Can block if the connection is blocked.  May raise
        socket.error if the connection is closed.

        """
        if IAC in buffer:
            buffer = buffer.replace(IAC, IAC+IAC)
        self.msg("send %r", buffer)
        self.sock.sendall(buffer)

    def read_until(self, match, timeout=None):
        """Read until a given string is encountered or until timeout.

        When no match is found, return whatever is available instead,
        possibly the empty string.  Raise EOFError if the connection
        is closed and no cooked data is available.

        """
        n = len(match)
        self.process_rawq()
        i = self.cookedq.find(match)
        if i >= 0:
            i = i+n
            buf = self.cookedq[:i]
            self.cookedq = self.cookedq[i:]
            return buf
        s_reply = ([self], [], [])
        s_args = s_reply
        if timeout is not None:
            s_args = s_args + (timeout,)
            from time import time
            time_start = time()
        while not self.eof and select.select(*s_args) == s_reply:
            i = max(0, len(self.cookedq)-n)
            self.fill_rawq()
            self.process_rawq()
            i = self.cookedq.find(match, i)
            if i >= 0:
                i = i+n
                buf = self.cookedq[:i]
                self.cookedq = self.cookedq[i:]
                return buf
            if timeout is not None:
                elapsed = time() - time_start
                if elapsed >= timeout:
                    break
                s_args = s_reply + (timeout-elapsed,)
        return self.read_very_lazy()

    def read_all(self):
        """Read all data until EOF; block until connection closed."""
        self.process_rawq()
        while not self.eof:
            self.fill_rawq()
            self.process_rawq()
        buf = self.cookedq
        self.cookedq = ''
        return buf

    def read_some(self):
        """Read at least one byte of cooked data unless EOF is hit.

        Return '' if EOF is hit.  Block if no data is immediately
        available.

        """
        self.process_rawq()
        while not self.cookedq and not self.eof:
            self.fill_rawq()
            self.process_rawq()
        buf = self.cookedq
        self.cookedq = ''
        return buf

    def read_very_eager(self):
        """Read everything that's possible without blocking in I/O (eager).

        Raise EOFError if connection closed and no cooked data
        available.  Return '' if no cooked data available otherwise.
        Don't block unless in the midst of an IAC sequence.

        """
        self.process_rawq()
        while not self.eof and self.sock_avail():
            self.fill_rawq()
            self.process_rawq()
        return self.read_very_lazy()

    def read_eager(self):
        """Read readily available data.

        Raise EOFError if connection closed and no cooked data
        available.  Return '' if no cooked data available otherwise.
        Don't block unless in the midst of an IAC sequence.

        """
        self.process_rawq()
        while not self.cookedq and not self.eof and self.sock_avail():
            self.fill_rawq()
            self.process_rawq()
        return self.read_very_lazy()

    def read_lazy(self):
        """Process and return data that's already in the queues (lazy).

        Raise EOFError if connection closed and no data available.
        Return '' if no cooked data available otherwise.  Don't block
        unless in the midst of an IAC sequence.

        """
        self.process_rawq()
        return self.read_very_lazy()

    def read_very_lazy(self):
        """Return any data available in the cooked queue (very lazy).

        Raise EOFError if connection closed and no data available.
        Return '' if no cooked data available otherwise.  Don't block.

        """
        buf = self.cookedq
        self.cookedq = ''
        if not buf and self.eof and not self.rawq:
            raise EOFError, 'telnet connection closed'
        return buf

    def read_sb_data(self):
        """Return any data available in the SB ... SE queue.

        Return '' if no SB ... SE available. Should only be called
        after seeing a SB or SE command. When a new SB command is
        found, old unread SB data will be discarded. Don't block.

        """
        buf = self.sbdataq
        self.sbdataq = ''
        return buf

    def set_option_negotiation_callback(self, callback):
        """Provide a callback function called after each receipt of a telnet option."""
        self.option_callback = callback

    def process_rawq(self):
        """Transfer from raw queue to cooked queue.

        Set self.eof when connection is closed.  Don't block unless in
        the midst of an IAC sequence.

        """
        buf = ['', '']
        try:
            while self.rawq:
                c = self.rawq_getchar()
                if not self.iacseq:
                    if c == theNULL:
                        continue
                    if c == "\021":
                        continue
                    if c != IAC:
                        buf[self.sb] = buf[self.sb] + c
                        continue
                    else:
                        self.iacseq += c
                elif len(self.iacseq) == 1:
                    # 'IAC: IAC CMD [OPTION only for WILL/WONT/DO/DONT]'
                    if c in (DO, DONT, WILL, WONT):
                        self.iacseq += c
                        continue

                    self.iacseq = ''
                    if c == IAC:
                        buf[self.sb] = buf[self.sb] + c
                    else:
                        if c == SB: # SB ... SE start.
                            self.sb = 1
                            self.sbdataq = ''
                        elif c == SE:
                            self.sb = 0
                            self.sbdataq = self.sbdataq + buf[1]
                            buf[1] = ''
                        if self.option_callback:
                            # Callback is supposed to look into
                            # the sbdataq
                            self.option_callback(self.sock, c, NOOPT)
                        else:
                            # We can't offer automatic processing of
                            # suboptions. Alas, we should not get any
                            # unless we did a WILL/DO before.
                            self.msg('IAC %d not recognized' % ord(c))
                elif len(self.iacseq) == 2:
                    cmd = self.iacseq[1]
                    self.iacseq = ''
                    opt = c
                    if cmd in (DO, DONT):
                        self.msg('IAC %s %d',
                            cmd == DO and 'DO' or 'DONT', ord(opt))
                        if self.option_callback:
                            self.option_callback(self.sock, cmd, opt)
                        else:
                            self.sock.sendall(IAC + WONT + opt)
                    elif cmd in (WILL, WONT):
                        self.msg('IAC %s %d',
                            cmd == WILL and 'WILL' or 'WONT', ord(opt))
                        if self.option_callback:
                            self.option_callback(self.sock, cmd, opt)
                        else:
                            self.sock.sendall(IAC + DONT + opt)
        except EOFError: # raised by self.rawq_getchar()
            self.iacseq = '' # Reset on EOF
            self.sb = 0
            pass
        self.cookedq = self.cookedq + buf[0]
        self.sbdataq = self.sbdataq + buf[1]

    def rawq_getchar(self):
        """Get next char from raw queue.

        Block if no data is immediately available.  Raise EOFError
        when connection is closed.

        """
        if not self.rawq:
            self.fill_rawq()
            if self.eof:
                raise EOFError
        c = self.rawq[self.irawq]
        self.irawq = self.irawq + 1
        if self.irawq >= len(self.rawq):
            self.rawq = ''
            self.irawq = 0
        return c

    def fill_rawq(self):
        """Fill raw queue from exactly one recv() system call.

        Block if no data is immediately available.  Set self.eof when
        connection is closed.

        """
        if self.irawq >= len(self.rawq):
            self.rawq = ''
            self.irawq = 0
        # The buffer size should be fairly small so as to avoid quadratic
        # behavior in process_rawq() above
        buf = self.sock.recv(50)
        self.msg("recv %r", buf)
        self.eof = (not buf)
        self.rawq = self.rawq + buf

    def sock_avail(self):
        """Test whether data is available on the socket."""
        return select.select([self], [], [], 0) == ([self], [], [])

    def interact(self):
        """Interaction function, emulates a very dumb telnet client."""
        if sys.platform == "win32":
            self.mt_interact()
            return
        while 1:
            rfd, wfd, xfd = select.select([self, sys.stdin], [], [])
            if self in rfd:
                try:
                    text = self.read_eager()
                except EOFError:
                    print('*** Connection closed by remote host ***')
                    break
                if text:
                    sys.stdout.write(text)
                    sys.stdout.flush()
            if sys.stdin in rfd:
                line = sys.stdin.readline()
                if not line:
                    break
                self.write(line)

    def mt_interact(self):
        """Multithreaded version of interact()."""
        import thread
        thread.start_new_thread(self.listener, ())
        while 1:
            line = sys.stdin.readline()
            if not line:
                break
            self.write(line)

    def listener(self):
        """Helper for mt_interact() -- this executes in the other thread."""
        while 1:
            try:
                data = self.read_eager()
            except EOFError:
                print('*** Connection closed by remote host ***')
                return
            if data:
                sys.stdout.write(data)
            else:
                sys.stdout.flush()

    def expect(self, list, timeout=None):
        """Read until one from a list of a regular expressions matches.

        The first argument is a list of regular expressions, either
        compiled (re.RegexObject instances) or uncompiled (strings).
        The optional second argument is a timeout, in seconds; default
        is no timeout.

        Return a tuple of three items: the index in the list of the
        first regular expression that matches; the match object
        returned; and the text read up till and including the match.

        If EOF is read and no text was read, raise EOFError.
        Otherwise, when nothing matches, return (-1, None, text) where
        text is the text received so far (may be the empty string if a
        timeout happened).

        If a regular expression ends with a greedy match (e.g. '.*')
        or if more than one expression can match the same input, the
        results are undeterministic, and may depend on the I/O timing.

        """
        re = None
        list = list[:]
        indices = range(len(list))
        for i in indices:
            if not hasattr(list[i], "search"):
                if not re: import re
                list[i] = re.compile(list[i])
        if timeout is not None:
            from time import time
            time_start = time()
        while 1:
            self.process_rawq()
            for i in indices:
                m = list[i].search(self.cookedq)
                if m:
                    e = m.end()
                    text = self.cookedq[:e]
                    self.cookedq = self.cookedq[e:]
                    return (i, m, text)
            if self.eof:
                break
            if timeout is not None:
                elapsed = time() - time_start
                if elapsed >= timeout:
                    break
                s_args = ([self.fileno()], [], [], timeout-elapsed)
                r, w, x = select.select(*s_args)
                if not r:
                    break
            self.fill_rawq()
        text = self.read_very_lazy()
        if not text and self.eof:
            raise EOFError
        return (-1, None, text)


def test():
    """Test program for telnetlib.

    Usage: python telnetlib.py [-d] ... [host [port]]

    Default host is localhost; default port is 23.

    """
    debuglevel = 0
    while sys.argv[1:] and sys.argv[1] == '-d':
        debuglevel = debuglevel+1
        del sys.argv[1]
    host = 'localhost'
    if sys.argv[1:]:
        host = sys.argv[1]
    port = 0
    if sys.argv[2:]:
        portstr = sys.argv[2]
        try:
            port = int(portstr)
        except ValueError:
            port = socket.getservbyname(portstr, 'tcp')
    tn = Telnet()
    tn.set_debuglevel(debuglevel)
    tn.open(host, port, timeout=0.5)
    tn.interact()
    tn.close()

if __name__ == '__main__':
    test()