Commit Graph

63 Commits

Author SHA1 Message Date
Ezio Melotti 4969f709cc #11515: Merge with 3.1. 2011-03-15 05:59:46 +02:00
Antoine Pitrou e312391529 Merged revisions 80487,80489 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80487 | antoine.pitrou | 2010-04-26 00:01:43 +0200 (lun., 26 avril 2010) | 12 lines

  Merged revisions 80484 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80484 | antoine.pitrou | 2010-04-25 23:40:32 +0200 (dim., 25 avril 2010) | 6 lines

    Issue #2302: Fix a race condition in SocketServer.BaseServer.shutdown,
    where the method could block indefinitely if called just before the
    event loop started running.  This also fixes the occasional freezes
    witnessed in test_httpservers.
  ........
................
  r80489 | antoine.pitrou | 2010-04-26 00:19:43 +0200 (lun., 26 avril 2010) | 9 lines

  Merged revisions 80480 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80480 | antoine.pitrou | 2010-04-25 23:15:50 +0200 (dim., 25 avril 2010) | 3 lines

    Replace a Lock with a better suited Event.
  ........
................
2010-04-25 22:26:08 +00:00
Antoine Pitrou 3bcba8e288 Merged revisions 80484 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80484 | antoine.pitrou | 2010-04-25 23:40:32 +0200 (dim., 25 avril 2010) | 6 lines

  Issue #2302: Fix a race condition in SocketServer.BaseServer.shutdown,
  where the method could block indefinitely if called just before the
  event loop started running.  This also fixes the occasional freezes
  witnessed in test_httpservers.
........
2010-04-25 22:01:43 +00:00
Kristján Valur Jónsson a5b47cea76 http://bugs.python.org/issue6382
added the shutdown_request() which can perform shutdown before calling close.  This is needed for the ForkingMixIn because different close semantics are required for child and parent process.  shutdown_request(), for TCP servers, calls socket.shutdown() and then calls close_request().  Therefore, this is not an backwards incompatible change, since subclasses that continue to override close_request() continue to work.
2009-07-07 09:09:10 +00:00
Kristján Valur Jónsson 200cfd00ab http://bugs.python.org/issue6381
merging revision 73819 from trunk
2009-07-04 15:18:00 +00:00
Kristján Valur Jónsson b8e138aa23 Revert last change, which was incorrect. 2009-07-04 15:16:38 +00:00
Kristján Valur Jónsson 8c4f4178cb http://bugs.python.org/issue6381
merging revision 73819 from trunk
2009-07-04 15:09:25 +00:00
Kristján Valur Jónsson 985fc6a304 http://bugs.python.org/issue6267
porting revision 73638 to py3k
2009-07-01 10:01:31 +00:00
Kristján Valur Jónsson 41a5750656 http://bugs.python.org/issue6192
Mergin revisions 73272 and 73546 to py3k
2009-06-28 21:34:22 +00:00
Benjamin Peterson ad3d5c2235 Merged revisions 69803-69805,69840,69901,69905,69907,69924,69927,69987 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69803 | georg.brandl | 2009-02-20 01:48:21 -0600 (Fri, 20 Feb 2009) | 1 line

  #5327: fix a broken link by joining it.
........
  r69804 | georg.brandl | 2009-02-20 02:22:21 -0600 (Fri, 20 Feb 2009) | 1 line

  At least separate imports from other statements.
........
  r69805 | georg.brandl | 2009-02-20 02:45:47 -0600 (Fri, 20 Feb 2009) | 2 lines

  Fix punctuation.
........
  r69840 | georg.brandl | 2009-02-21 13:09:40 -0600 (Sat, 21 Feb 2009) | 1 line

  #5338, #5339: two types in the API manual.
........
  r69901 | georg.brandl | 2009-02-23 05:24:46 -0600 (Mon, 23 Feb 2009) | 2 lines

  #5349: C++ pure virtuals can also have an implementation.
........
  r69905 | georg.brandl | 2009-02-23 09:51:27 -0600 (Mon, 23 Feb 2009) | 2 lines

  #5352: str.count() counts non-overlapping instances.
........
  r69907 | georg.brandl | 2009-02-23 12:33:48 -0600 (Mon, 23 Feb 2009) | 1 line

  Fix grammar.
........
  r69924 | benjamin.peterson | 2009-02-23 20:45:35 -0600 (Mon, 23 Feb 2009) | 1 line

  update README on running tests
........
  r69927 | neil.schemenauer | 2009-02-23 22:23:25 -0600 (Mon, 23 Feb 2009) | 1 line

  Fix call to os.waitpid, it does not take keyword args.
........
  r69987 | benjamin.peterson | 2009-02-25 18:30:11 -0600 (Wed, 25 Feb 2009) | 1 line

  fix str.format()'s first arg #5371
........
2009-02-26 03:38:59 +00:00
Benjamin Peterson 8b6dc5cfab kill another set_daemon instance 2008-09-20 12:52:07 +00:00
Benjamin Peterson b03ca4bc68 fix more threading API related bugs 2008-06-13 02:00:47 +00:00
Alexandre Vassalotti ce261952e6 Renamed the SocketServer module to 'socketserver'.
Merged revisions 63132 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r63132 | alexandre.vassalotti | 2008-05-11 22:11:22 -0400 (Sun, 11 May 2008) | 4 lines

  Updated all import statements to use the new socketserver module name.
  Renamed socketserver module in its own documentation.
  Renamed documentation references.
........
2008-05-12 02:31:37 +00:00