Commit Graph

6039 Commits

Author SHA1 Message Date
Georg Brandl f9f33aa38d Merged revisions 81465-81466 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81465 | georg.brandl | 2010-05-22 13:29:19 +0200 (Sa, 22 Mai 2010) | 2 lines

  Issue #3924: Ignore cookies with invalid "version" field in cookielib.
........
  r81466 | georg.brandl | 2010-05-22 13:31:16 +0200 (Sa, 22 Mai 2010) | 1 line

  Underscore the name of an internal utility function.
........
2010-05-22 11:32:59 +00:00
Victor Stinner f5a3eafaac Merged revisions 81459 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81459 | victor.stinner | 2010-05-22 04:11:07 +0200 (sam., 22 mai 2010) | 3 lines

  Issue #6268: Fix seek() method of codecs.open(), don't read the BOM twice
  after seek(0)
........
2010-05-22 02:12:28 +00:00
Victor Stinner 9a4a01df75 Merged revisions 81454 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81454 | victor.stinner | 2010-05-22 00:50:28 +0200 (sam., 22 mai 2010) | 3 lines

  Issue #5640: Fix Shift-JIS incremental encoder for error handlers different
  than strict
........
2010-05-21 22:55:31 +00:00
Benjamin Peterson a3401654e1 Merged revisions 81432 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81432 | benjamin.peterson | 2010-05-21 16:31:24 -0500 (Fri, 21 May 2010) | 1 line

  ensure the last line has a trailing newline #8782
........
2010-05-21 21:45:16 +00:00
Benjamin Peterson 0278a67e83 Merged revisions 81414 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81414 | benjamin.peterson | 2010-05-21 15:51:45 -0500 (Fri, 21 May 2010) | 1 line

  return NotImplemented from Mapping when comparing to a non-mapping #8729
........
2010-05-21 21:03:02 +00:00
Matthias Klose 0a3b69ef0a Merged revisions 80793 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80793 | barry.warsaw | 2010-05-05 18:15:09 +0200 (Mi, 05 Mai 2010) | 5 lines

  Bug 7755: audiotest.au is arguably copyrighted material, but definitely makes
  Debian unhappy.  The actual contents of the audio clip are unimportant, so
  replace it with something that we know is okay.  Guido likes woodpeckers.
........
2010-05-21 13:08:20 +00:00
R. David Murray d08a3e45f3 Unblocked and Merged revisions 70997 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70997 | r.david.murray | 2009-04-01 17:26:18 -0400 (Wed, 01 Apr 2009) | 3 lines

  Add tests checking the CSV module's ability to handle
  embedded newlines in quoted field values.
........
2010-05-20 20:53:34 +00:00
Brett Cannon 7d006260a5 Merged revisions 81380 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81380 | brett.cannon | 2010-05-20 11:37:55 -0700 (Thu, 20 May 2010) | 8 lines

  Turned out that if you used explicit relative import syntax
  (e.g. from .os import sep) and it failed, import would still try the implicit
  relative import semantics of an absolute import (from os import sep). That's
  not right, so when level is negative, only do explicit relative import
  semantics.

  Fixes issue #7902. Thanks to Meador Inge for the patch.
........
2010-05-20 18:41:08 +00:00
Georg Brandl 6a05e8a606 Merged revisions 70697 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70697 | benjamin.peterson | 2009-03-29 21:22:35 +0000 (So, 29 Mär 2009) | 1 line

  this has been fixed since 2.6 (I love removing these)
........
2010-05-18 23:47:48 +00:00
Georg Brandl eb41214dbc Merged revisions 79822,79828,79862,80067,80069,80080-80081,80084,80432-80433 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79822 | georg.brandl | 2010-04-06 08:18:15 +0000 (Di, 06 Apr 2010) | 1 line

  #8320: document return value of recv_into().
........
  r79828 | georg.brandl | 2010-04-06 14:33:44 +0000 (Di, 06 Apr 2010) | 1 line

  Add JP.
........
  r79862 | georg.brandl | 2010-04-06 20:27:59 +0000 (Di, 06 Apr 2010) | 1 line

  Fix syntax.
........
  r80067 | georg.brandl | 2010-04-14 08:53:38 +0000 (Mi, 14 Apr 2010) | 1 line

  #5341: typo.
........
  r80069 | georg.brandl | 2010-04-14 13:50:31 +0000 (Mi, 14 Apr 2010) | 1 line

  Add an x-ref to where the O_ constants are documented and move the SEEK_ constants after lseek().
........
  r80080 | georg.brandl | 2010-04-14 19:16:38 +0000 (Mi, 14 Apr 2010) | 1 line

  #8399: add note about Windows and O_BINARY.
........
  r80081 | georg.brandl | 2010-04-14 21:34:44 +0000 (Mi, 14 Apr 2010) | 1 line

  #5250: document __instancecheck__ and __subclasscheck__.  I hope the part about the class/metaclass distinction is understandable.
........
  r80084 | georg.brandl | 2010-04-14 21:46:45 +0000 (Mi, 14 Apr 2010) | 1 line

  Fix missing.
........
  r80432 | georg.brandl | 2010-04-24 08:56:58 +0000 (Sa, 24 Apr 2010) | 1 line

  Markup fixes.
........
  r80433 | georg.brandl | 2010-04-24 09:08:10 +0000 (Sa, 24 Apr 2010) | 1 line

  #7507: quote "!" in pipes.quote(); it is a special character for some shells.
........
2010-05-18 23:19:34 +00:00
Giampaolo Rodolà 30aa46c910 Merged revisions 81294 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81294 | giampaolo.rodola | 2010-05-18 22:04:31 +0200 (mar, 18 mag 2010) | 1 line

  Fix issue #8573 (asyncore._strerror bug): fixed os.strerror typo; included NameError in the tuple of expected exception; added test case for asyncore._strerror.
........
2010-05-18 20:09:25 +00:00
Antoine Pitrou 5de1594e28 Merged revisions 81275 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81275 | antoine.pitrou | 2010-05-17 21:56:59 +0200 (lun., 17 mai 2010) | 4 lines

  Issue #7079: Fix a possible crash when closing a file object while using
  it from another thread.  Patch by Daniel Stutzbach.
........
2010-05-17 20:00:52 +00:00
Victor Stinner f10d6fb3d9 Merged revisions 81224 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81224 | victor.stinner | 2010-05-16 02:34:40 +0200 (dim., 16 mai 2010) | 4 lines

  Use with open() as fo: ... instead of try: fo = open(...) finally: fo.close()

  fo is not set if the open() fails.
........
2010-05-16 00:35:43 +00:00
Antoine Pitrou c400610321 Issue #7640: In the new `io` module, fix relative seek() for buffered
readable streams when the internal buffer isn't empty.  Patch by Pascal
Chambon.
2010-05-15 20:33:07 +00:00
Stefan Krah 686e56bcf1 Use stderr instead of stdout for warning. 2010-05-15 09:34:50 +00:00
Senthil Kumaran b87d04fc96 Merged revisions 81130 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81130 | senthil.kumaran | 2010-05-13 08:55:21 +0530 (Thu, 13 May 2010) | 3 lines

  Fix Issue8657 - adding git and git+ssh as know schemes.
........
2010-05-13 03:32:26 +00:00
Mark Dickinson 838edd8bc6 Merged revisions 81126 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81126 | mark.dickinson | 2010-05-12 20:53:36 +0100 (Wed, 12 May 2010) | 1 line

  Fix unused variable in test_factorial.
........
2010-05-12 19:56:10 +00:00
Antoine Pitrou ca561f5e72 Merged revisions 81098 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81098 | antoine.pitrou | 2010-05-12 01:42:28 +0200 (mer., 12 mai 2010) | 5 lines

  Issue #8681: Make the zlib module's error messages more informative when
  the zlib itself doesn't give any detailed explanation.
........
2010-05-11 23:45:55 +00:00
Antoine Pitrou 33c5813a59 Merged revisions 81094 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81094 | antoine.pitrou | 2010-05-12 01:32:31 +0200 (mer., 12 mai 2010) | 6 lines

  Issue #8672: Add a zlib test ensuring that an incomplete stream can be
  handled by a decompressor object without errors (it returns incomplete
  uncompressed data).
........
2010-05-11 23:33:53 +00:00
Jean-Paul Calderone 0819b092d6 Merged revisions 81007 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81007 | jean-paul.calderone | 2010-05-08 16:06:02 -0400 (Sat, 08 May 2010) | 1 line

  Skip signal handler re-installation if it is not necessary.  Issue 8354.
........
2010-05-08 21:11:28 +00:00
Benjamin Peterson 614813941d Merged revisions 80991 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80991 | benjamin.peterson | 2010-05-08 11:44:52 -0500 (Sat, 08 May 2010) | 1 line

  run and fix enumerate start test cases #8636
........
2010-05-08 16:51:40 +00:00
Senthil Kumaran 2add184b2d Merged revisions 80953 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80953 | senthil.kumaran | 2010-05-08 08:41:50 +0530 (Sat, 08 May 2010) | 3 lines

  Fix Issue8656 - urllib2 mangles file://-scheme URLs
........
2010-05-08 03:14:33 +00:00
Antoine Pitrou c7035cdc3e Merged revisions 80926 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80926 | antoine.pitrou | 2010-05-07 18:50:34 +0200 (ven., 07 mai 2010) | 5 lines

  Issue #8571: Fix an internal error when compressing or decompressing a
  chunk larger than 1GB with the zlib module's compressor and decompressor
  objects.
........
2010-05-07 16:59:00 +00:00
Mark Dickinson e02c9d22f6 Merged revisions 80758 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80758 | mark.dickinson | 2010-05-04 17:18:25 +0100 (Tue, 04 May 2010) | 9 lines

  Issue #1533: fix inconsistency in range function argument processing:
  any non-float non-integer argument is now converted to an integer (if
  possible) using its __int__ method.  Previously, only small arguments
  were treated this way; larger arguments (those whose __int__ was
  outside the range of a C long) would produce a TypeError.

  Patch by Alexander Belopolsky (with minor modifications).
........
2010-05-07 13:23:18 +00:00
Senthil Kumaran cdf48a8ec2 Merged revisions 80908 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80908 | senthil.kumaran | 2010-05-07 09:37:29 +0530 (Fri, 07 May 2010) | 3 lines

  Testsuite for RFC3986 based parsing scenario. Related Issue1462525.
........
2010-05-07 04:15:56 +00:00
Giampaolo Rodolà 902b57b6f6 Merged revisions 80875 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80875 | giampaolo.rodola | 2010-05-06 19:57:06 +0200 (gio, 06 mag 2010) | 1 line

  Fix asyncore issues 8573 and 8483: _strerror might throw ValueError; asyncore.__getattr__ cheap inheritance caused confusing error messages when accessing undefined class attributes; added an alias for __str__ which now is used as a fallback for __repr__
........
2010-05-06 18:24:02 +00:00
Antoine Pitrou 1222669b44 Issue #8629: Disable some test_ssl tests, since they give different
results with OpenSSL 1.0.0 and higher.
2010-05-06 13:49:10 +00:00
Tarek Ziadé 06f78cd91e Merged revisions 80830 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80830 | tarek.ziade | 2010-05-06 00:15:31 +0200 (Thu, 06 May 2010) | 1 line

  Fixed #4265: shutil.copyfile() was leaking file descriptors when disk fills
........
2010-05-05 22:21:13 +00:00
Ronald Oussoren 29c0fbc4f2 Merged revisions 80784 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80784 | ronald.oussoren | 2010-05-05 16:48:37 +0200 (Wed, 05 May 2010) | 9 lines

  The C function used by uuid.uuid4 is broken on
  OSX 10.6 in that after os.fork() the parent and
  child generate the same sequence of UUIDs.

  This patch falls back to the the Python implementation
  on OSX 10.6 or later.

  Fixes issue #8621.
........
2010-05-05 15:13:15 +00:00
Victor Stinner 7c8eaad1bf Merged revisions 80777 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80777 | victor.stinner | 2010-05-05 14:40:49 +0200 (mer., 05 mai 2010) | 3 lines

  Issue #8313: traceback.format_exception_only() encodes unicode message to
  ASCII with backslashreplace error handler if str(value) failed
........
2010-05-05 12:45:31 +00:00
Mark Dickinson 1cdfa5f5bc Merged revisions 80753 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80753 | mark.dickinson | 2010-05-04 15:25:50 +0100 (Tue, 04 May 2010) | 10 lines

  Issue #8567: Fix incorrect precedence of signals in Decimal module.

  When a Decimal operation raises multiple signals and more than one of
  those signals is trapped, the specification determines the order in
  which the signals should be handled.  In many cases this order wasn't
  being followed, leading to the wrong Python exception being raised.
  This commit fixes those cases, and adds extra tests.  The tests are
  only enabled when EXTENDEDERRORTESTS is True, since they involve
  rerunning each Decimal testcase several times.
........
2010-05-04 14:30:32 +00:00
Antoine Pitrou 01a255add1 Merged revisions 80720 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80720 | antoine.pitrou | 2010-05-03 18:25:33 +0200 (lun., 03 mai 2010) | 5 lines

  Issue #7865: The close() method of :mod:`io` objects should not swallow
  exceptions raised by the implicit flush().  Also ensure that calling
  close() several times is supported.  Patch by Pascal Chambon.
........
2010-05-03 16:48:13 +00:00
Antoine Pitrou 73e97d8e21 Merged revisions 80690 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80690 | antoine.pitrou | 2010-05-01 22:26:58 +0200 (sam., 01 mai 2010) | 3 lines

  Remove duplicate test
........
2010-05-01 20:28:45 +00:00
Mark Dickinson 813f118157 Merged revisions 80681 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80681 | mark.dickinson | 2010-05-01 12:46:20 +0100 (Sat, 01 May 2010) | 2 lines

  Fix incorrect use of a list as the target of an 'except' clause in test_decimal.py.
........
2010-05-01 11:56:48 +00:00
Senthil Kumaran fcfd25bd72 Merged revisions 80675 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80675 | senthil.kumaran | 2010-05-01 13:31:56 +0530 (Sat, 01 May 2010) | 3 lines

  Fix issue8582: urllib.urlretrieve fails with ValueError: Invalid format string
........
2010-05-01 08:06:38 +00:00
Antoine Pitrou 838c1ee157 Merged revisions 80669 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80669 | antoine.pitrou | 2010-05-01 01:08:48 +0200 (sam., 01 mai 2010) | 4 lines

  Issue #8576: Remove use of find_unused_port() in test_smtplib and
  test_multiprocessing.  Patch by Paul Moore.
........
2010-04-30 23:10:44 +00:00
Lars Gustäbel b4a5bc9313 Merged revisions 80616 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80616 | lars.gustaebel | 2010-04-29 17:23:38 +0200 (Thu, 29 Apr 2010) | 4 lines

  Issue #8464: tarfile.open(name, mode="w|") no longer creates
  files with execute permissions set.
........
2010-04-29 15:35:30 +00:00
Antoine Pitrou d2867642c0 Merged revisions 80596 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80596 | antoine.pitrou | 2010-04-28 23:11:01 +0200 (mer., 28 avril 2010) | 3 lines

  Fix style issues in test_ssl
........
2010-04-28 21:12:43 +00:00
Senthil Kumaran 379eaac7a7 Merged revisions 80583 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80583 | senthil.kumaran | 2010-04-28 22:50:43 +0530 (Wed, 28 Apr 2010) | 3 lines

  Fixed Issue6312 - httplib fails with HEAD requests to pages with "transfer-encoding: chunked"
........
2010-04-28 17:25:58 +00:00
Antoine Pitrou 12cb1297f4 Merged revisions 80557 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80557 | antoine.pitrou | 2010-04-28 00:03:37 +0200 (mer., 28 avril 2010) | 4 lines

  Issue #8086: In :func:`ssl.DER_cert_to_PEM_cert()`, fix missing newline
  before the certificate footer.  Patch by Kyle VanderBeek.
........
2010-04-27 22:05:18 +00:00
Victor Stinner a7baa4bcff Issue #7027: regrtest.py keeps a reference to the encodings.ascii module as a
workaround to #7140 bug
2010-04-27 18:25:39 +00:00
Antoine Pitrou 94d6fba9e1 Merged revisions 80534 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80534 | antoine.pitrou | 2010-04-27 15:13:26 +0200 (mar., 27 avril 2010) | 3 lines

  socket.error can really happen here, and fix a possible NameError
........
2010-04-27 13:14:50 +00:00
Antoine Pitrou 6ab7f009ba Merged revisions 80529 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80529 | antoine.pitrou | 2010-04-27 12:32:58 +0200 (mar., 27 avril 2010) | 4 lines

  Qualify or remove or bare excepts.  Simplify exception handling in places.
  Remove uses of test_support.TestFailed.
........
2010-04-27 10:41:42 +00:00
Antoine Pitrou 77a1c36fb7 Merged revisions 80526 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80526 | antoine.pitrou | 2010-04-27 11:51:18 +0200 (mar., 27 avril 2010) | 5 lines

  replace custom code with standard library functionality (HTTPServer.shutdown())
  + enable test that was never run (!)
  + make tests faster by lowering polling timeout
........
2010-04-27 09:54:14 +00:00
Antoine Pitrou 6535b31ced Merged revisions 80522 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80522 | antoine.pitrou | 2010-04-27 10:40:51 +0200 (mar., 27 avril 2010) | 3 lines

  Remove uses of find_unused_port() in test_ssl, and small cleanups
........
2010-04-27 08:43:11 +00:00
Antoine Pitrou 6ec1a16f7c 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:09:32 +00:00
Antoine Pitrou 53d7d06ed3 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 21:55:45 +00:00
Antoine Pitrou c689d96044 Merged revisions 80451-80452 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80451 | antoine.pitrou | 2010-04-24 21:57:01 +0200 (sam., 24 avril 2010) | 4 lines

  The do_handshake() method of SSL objects now adjusts the blocking mode of
  the SSL structure if necessary (as other methods already do).
........
  r80452 | antoine.pitrou | 2010-04-24 22:04:58 +0200 (sam., 24 avril 2010) | 4 lines

  Issue #5103: SSL handshake would ignore the socket timeout and block
  indefinitely if the other end didn't respond.
........
2010-04-24 20:13:37 +00:00
Antoine Pitrou 0753d947df Merged revisions 80434 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80434 | antoine.pitrou | 2010-04-24 12:43:57 +0200 (sam., 24 avril 2010) | 5 lines

  Make test_makefile_close a networked test (can't read() from a non-connected
  socket under OS X), and skip it under Windows (where sockets can't be read()
  from using their fds).
........
2010-04-24 11:09:52 +00:00
Antoine Pitrou d4030dacc6 Merged revisions 80428 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80428 | antoine.pitrou | 2010-04-24 01:25:45 +0200 (sam., 24 avril 2010) | 4 lines

  Issue #5238: Calling makefile() on an SSL object would prevent the
  underlying socket from being closed until all objects get truely destroyed.
........
2010-04-23 23:35:01 +00:00
Antoine Pitrou 3df58d11be Merged revisions 80423 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80423 | antoine.pitrou | 2010-04-24 00:54:59 +0200 (sam., 24 avril 2010) | 4 lines

  Issue #7943: Fix circular reference created when instantiating an SSL
  socket.  Initial patch by Péter Szabó.
........
2010-04-23 23:07:37 +00:00
Antoine Pitrou b7c656f2f5 Merged revisions 80375 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80375 | antoine.pitrou | 2010-04-22 20:00:41 +0200 (jeu., 22 avril 2010) | 3 lines

  Skip test on old versions of OpenSSL
........
2010-04-22 18:42:58 +00:00
Antoine Pitrou 878602a284 Merged revisions 80314-80315 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80314 | antoine.pitrou | 2010-04-21 21:28:03 +0200 (mer., 21 avril 2010) | 5 lines

  Issue #8484: Load all ciphers and digest algorithms when initializing
  the _ssl extension, such that verification of some SSL certificates
  doesn't fail because of an "unknown algorithm".
........
  r80315 | antoine.pitrou | 2010-04-21 21:36:23 +0200 (mer., 21 avril 2010) | 3 lines

  Forgot to add the sample certificate (followup to r80314)
........
2010-04-21 19:41:28 +00:00
R. David Murray 12c5fbb1c6 Merged revisions 80144 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80144 | r.david.murray | 2010-04-17 01:26:26 -0400 (Sat, 17 Apr 2010) | 8 lines

  Issue #3864: Skip three test_signal tests on freebsd6 due to platform bug.

  Two itimer tests and an interprocess signal test fail on FreeBSD 6 if
  any test that starts a thread runs before test_signal.  Since FreeBSD7
  does not show this behavior, the bug is most likely a platform bug,
  so this patch just skips the failing tests on freebsd6.
........
2010-04-21 01:41:41 +00:00
Benjamin Peterson dbcf740f3f skip this test on windows, too #8459 2010-04-20 21:02:36 +00:00
Stefan Krah 488fea3cca Merged revisions 80238 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80238 | stefan.krah | 2010-04-20 09:59:10 +0200 (Tue, 20 Apr 2010) | 9 lines


  1) The timeout in the itimer tests was too low for slow or heavily
     loaded machines.

  2) Even with the increased timeout, the OS does not guarantee that
     a process will get a certain amount of virtual time in 60s, so
     the failure is changed to a diagnostic.
........
2010-04-20 08:07:08 +00:00
Senthil Kumaran c00deec386 Merged revisions 80236 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80236 | senthil.kumaran | 2010-04-20 12:24:59 +0530 (Tue, 20 Apr 2010) | 3 lines

  Fix Issue8460: Victor's patch to add timeout in test_urllib2net test_urls.
........
2010-04-20 07:06:45 +00:00
Victor Stinner 342e0fd80b (I hope) last try to fix test_winsound (skip tests)
Remove print, it produces "unexpected output" and the test fails :-/
2010-04-19 16:03:48 +00:00
Victor Stinner b2a28c3bd5 test_winsound: new try to skip the tests. In Python 2.6, TestSkipped is used to
skip the whole file, not a particular function.
2010-04-19 15:18:07 +00:00
Victor Stinner 797a49c879 Oops, unittest has no SkipTest exception. I understood the original change:
replace unittest.SkipTest by TestSkipped.
2010-04-19 12:20:14 +00:00
Victor Stinner b46d7ba12f Fix r80029 (backport of r80026), test_winsound: Python 2.6 has no
unittest.skipUnless(). Use raise test_support.TestSkipped() instead.
2010-04-19 12:14:14 +00:00
Victor Stinner e2028797ac Fix r80180 (backport of r80178): SkipTest => unittest.SkipTest in test_locale
The original commit (r80178) was correct. The bug was introduced during the
backport, funny :-)
2010-04-19 11:50:08 +00:00
Raymond Hettinger efa19849ce Issue 8436: set.__init__ accepts keyword args 2010-04-18 22:59:34 +00:00
Ronald Oussoren 0746619c04 Merged revisions 80178 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80178 | ronald.oussoren | 2010-04-18 15:47:49 +0200 (Sun, 18 Apr 2010) | 2 lines

  Fix for issue #7072
........
2010-04-18 14:34:22 +00:00
Benjamin Peterson c218ce86c4 Merged revisions 80123-80124,80126 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80123 | benjamin.peterson | 2010-04-16 17:24:16 -0500 (Fri, 16 Apr 2010) | 1 line

  bytearray -> type2test
........
  r80124 | benjamin.peterson | 2010-04-16 17:25:57 -0500 (Fri, 16 Apr 2010) | 1 line

  fix typo
........
  r80126 | benjamin.peterson | 2010-04-16 17:35:38 -0500 (Fri, 16 Apr 2010) | 1 line

  have a clear error when passing something > sys.maxsize to bytearray
........
2010-04-16 22:43:53 +00:00
Brian Curtin 56da87c914 Merged revisions 80026 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80026 | brian.curtin | 2010-04-12 21:25:20 -0500 (Mon, 12 Apr 2010) | 4 lines

  Fix #7306. Add skips to test_winsound when no default sound is configured.

  These failures occur on a Windows Server 2003 machine I test on.
........
2010-04-13 02:39:59 +00:00
Stefan Krah 833c7a379f Merged revisions 80000 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80000 | stefan.krah | 2010-04-12 17:21:25 +0200 (Mon, 12 Apr 2010) | 3 lines

  Issue #8367: Fix spurious test failure on systems without a sound card.
........
2010-04-12 15:29:47 +00:00
Senthil Kumaran 2ffceb67ab Merged revisions 79988 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79988 | senthil.kumaran | 2010-04-12 12:20:24 +0530 (Mon, 12 Apr 2010) | 3 lines

  Adding additional examples of valid urls as per RFC 3986 (for issue8339)
........
2010-04-12 06:56:24 +00:00
Stefan Krah bdee329d80 Merged revisions 79954 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79954 | stefan.krah | 2010-04-11 17:15:54 +0200 (Sun, 11 Apr 2010) | 17 lines


  Fix for issues #3581, #1481 and #7650:

  1. The assumptions in check_node() were too restrictive:

       - Hardware addresses with universal_local_bit=1 are valid
         (locally administered).

       - Many of the tested functions (including uuid.getnode())
         may return valid RFC 4122 random node IDs. These are pretty
         much random 48-bit values with the multicast bit set to 1.

  2. _unixdll_getnode() calls _uuid_generate_time(), which may be None
     on some platforms. The resulting TypeError is now caught.
........
2010-04-11 16:36:10 +00:00
Benjamin Peterson 1b21be2662 remove use of 2.7 unittest features 2010-04-07 20:40:30 +00:00
Benjamin Peterson 8a48808f33 Merged revisions 79866-79867 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79866 | benjamin.peterson | 2010-04-06 16:37:06 -0500 (Tue, 06 Apr 2010) | 1 line

  use skip decorator
........
  r79867 | benjamin.peterson | 2010-04-06 16:50:00 -0500 (Tue, 06 Apr 2010) | 1 line

  remove a optimization that resulted in unexpected behavior #8929
........
2010-04-06 21:55:35 +00:00
Antoine Pitrou 644c9dd973 Merged revisions 79848 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79848 | antoine.pitrou | 2010-04-06 19:21:09 +0200 (mar., 06 avril 2010) | 3 lines

  Issue #8193: Fix test_zlib failure with zlib 1.2.4.
........
2010-04-06 17:24:02 +00:00
Mark Dickinson e9a5a549e4 Fix incorrect stacklevel for struct warnings. (Partial backport of r78690). 2010-04-06 15:19:40 +00:00
Mark Dickinson d9a91305e2 Merged revisions 79661 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79661 | mark.dickinson | 2010-04-03 11:27:05 +0100 (Sat, 03 Apr 2010) | 14 lines

  Fix a couple of issues with the test_structmembersType class in _testcapimodule

   - rename to _test_structmembersType to avoid the class being automatically
     called by test_capi

   - allow space for trailing NUL in inplace_member field of all_structmembers

   - use T_STRING_INPLACE instead of T_INPLACE_STRING as keyword argument
     to _test_structmembersType initializer

   - don't attempt to initialize inplace_member field if T_STRING_INPLACE
     argument wasn't supplied.
........
2010-04-03 10:46:46 +00:00
Mark Dickinson 2f7d46fde2 Remove use of skipUnless; this was causing test_structmembers to fail. 2010-04-03 10:44:11 +00:00
Benjamin Peterson 498289ef28 Merged revisions 79642,79644 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79642 | benjamin.peterson | 2010-04-02 20:08:34 -0500 (Fri, 02 Apr 2010) | 1 line

  split out large test function
........
  r79644 | benjamin.peterson | 2010-04-02 20:28:57 -0500 (Fri, 02 Apr 2010) | 1 line

  give TypeError when trying to set T_STRING_INPLACE
........
2010-04-03 01:40:44 +00:00
Mark Dickinson 2cbfb2d001 Undo accidental change in r79612. 2010-04-02 19:28:02 +00:00
Mark Dickinson 1db6e103d8 Undo temporary commits r79601 and r79560. 2010-04-02 19:24:36 +00:00
Mark Dickinson 87cc591e67 Add missing position specifiers in format string. 2010-04-02 14:01:22 +00:00
Mark Dickinson 11d36bc135 Output extra debug info for fromhex tests, to aid diagnosis of issue 8265.
This commit is temporary, and will be reverted within the next 3 days.
2010-04-01 20:49:45 +00:00
Brian Curtin a5d9679ef3 Merged revisions 79518 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79518 | brian.curtin | 2010-03-30 22:10:21 -0500 (Tue, 30 Mar 2010) | 2 lines

  Fix #8225. xml.etree was displaying an incorrect link when viewed in help.
........
2010-03-31 03:14:27 +00:00
Florent Xicluna dc92ce97af Fix an oversight in merge r78282. 2010-03-30 10:39:44 +00:00
Senthil Kumaran 34f9277d56 Merged revisions 79047 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79047 | senthil.kumaran | 2010-03-18 17:44:15 +0530 (Thu, 18 Mar 2010) | 3 lines

  Fix for Issue8135 - urllib.unquote to support mixed percent escapes
........
2010-03-29 19:30:44 +00:00
Florent Xicluna 3522e04071 Merged revisions 79195,79425,79427,79450 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79195 | florent.xicluna | 2010-03-21 13:27:20 +0100 (dim, 21 mar 2010) | 2 lines

  Issue #8179: Fix macpath.realpath() on a non-existing path.
........
  r79425 | florent.xicluna | 2010-03-25 21:32:07 +0100 (jeu, 25 mar 2010) | 2 lines

  Syntax cleanup `== None` -> `is None`
........
  r79427 | florent.xicluna | 2010-03-25 21:39:10 +0100 (jeu, 25 mar 2010) | 2 lines

  Fix test_unittest and test_warnings when running "python -Werror -m test.regrtest"
........
  r79450 | florent.xicluna | 2010-03-26 20:32:44 +0100 (ven, 26 mar 2010) | 2 lines

  Ensure that the failed or unexpected tests are sorted before printing.
........
2010-03-28 09:37:55 +00:00
Florent Xicluna 61b9c3ed5f Merged revisions 79297,79307 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79297 | florent.xicluna | 2010-03-22 18:18:18 +0100 (lun, 22 mar 2010) | 2 lines

  #7668: Fix test_httpservers failure when sys.executable contains non-ASCII bytes.
........
  r79307 | florent.xicluna | 2010-03-22 23:45:50 +0100 (lun, 22 mar 2010) | 2 lines

  #7667: Fix doctest failures with non-ASCII paths.
........
2010-03-23 13:30:12 +00:00
Ezio Melotti c0fd6ffd4f Merged revisions 73824,78887,78895,78900,79024 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73824 | ezio.melotti | 2009-07-04 04:18:08 +0300 (Sat, 04 Jul 2009) | 1 line

  #6398 typo: versio. -> version.
........
  r78887 | ezio.melotti | 2010-03-13 02:15:36 +0200 (Sat, 13 Mar 2010) | 1 line

  fix broken links
........
  r78895 | ezio.melotti | 2010-03-13 03:21:34 +0200 (Sat, 13 Mar 2010) | 1 line

  #8011: use exc.tb_lineno instead of traceback.tb_lineno() and pep8ify variable names.
........
  r78900 | ezio.melotti | 2010-03-13 06:39:51 +0200 (Sat, 13 Mar 2010) | 1 line

  Silence compiler warnings.
........
  r79024 | ezio.melotti | 2010-03-17 16:22:34 +0200 (Wed, 17 Mar 2010) | 1 line

  Use "x in y" instead of y.find(x) != -1.
........
2010-03-23 13:20:39 +00:00
Florent Xicluna d474f3a239 Merged revisions 78800 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78800 | florent.xicluna | 2010-03-08 16:20:28 +0100 (lun, 08 mar 2010) | 2 lines

  #7624: Fix isinstance(foo(), collections.Callable) for old-style classes.
........
2010-03-23 12:37:29 +00:00
Victor Stinner 4fd2ff90a4 Merged revisions 79278,79280 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79278 | victor.stinner | 2010-03-22 13:24:37 +0100 (lun., 22 mars 2010) | 2 lines

  Issue #1583863: An unicode subclass can now override the __str__ method
........
  r79280 | victor.stinner | 2010-03-22 13:36:28 +0100 (lun., 22 mars 2010) | 5 lines

  Fix the NEWS about my last commit: an unicode subclass can now override the
  __unicode__ method (and not the __str__ method).

  Simplify also the testcase.
........
2010-03-22 12:56:39 +00:00
Georg Brandl 5a7eca1749 Merged revisions 77593,77702-77703,77858,77887,78113-78115,78117,78245,78385-78386,78496,78760,78771-78773,78802 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77593 | georg.brandl | 2010-01-18 00:33:53 +0100 (Mo, 18 Jan 2010) | 1 line

  Fix internal reference.
........
  r77702 | georg.brandl | 2010-01-23 09:43:31 +0100 (Sa, 23 Jan 2010) | 1 line

  #7762: fix refcount annotation of PyUnicode_Tailmatch().
........
  r77703 | georg.brandl | 2010-01-23 09:47:54 +0100 (Sa, 23 Jan 2010) | 1 line

  #7725: fix referencing issue.
........
  r77858 | georg.brandl | 2010-01-30 18:57:48 +0100 (Sa, 30 Jan 2010) | 1 line

  #7802: fix invalid example (heh).
........
  r77887 | georg.brandl | 2010-01-31 19:51:49 +0100 (So, 31 Jan 2010) | 5 lines

  Fix-up ftplib documentation:
  move exception descriptions to toplevel, not inside a class
  remove attribution in "versionadded"
  spell and grammar check docstring of FTP_TLS
........
  r78113 | georg.brandl | 2010-02-08 23:37:20 +0100 (Mo, 08 Feb 2010) | 1 line

  Fix missing string formatting argument.
........
  r78114 | georg.brandl | 2010-02-08 23:37:52 +0100 (Mo, 08 Feb 2010) | 1 line

  Fix undefined local.
........
  r78115 | georg.brandl | 2010-02-08 23:40:51 +0100 (Mo, 08 Feb 2010) | 1 line

  Fix missing string formatting placeholder.
........
  r78117 | georg.brandl | 2010-02-08 23:48:37 +0100 (Mo, 08 Feb 2010) | 1 line

  Convert test failure from output-producing to self.fail().
........
  r78245 | georg.brandl | 2010-02-19 20:36:08 +0100 (Fr, 19 Feb 2010) | 1 line

  #7967: PyXML is no more.
........
  r78385 | georg.brandl | 2010-02-23 22:33:17 +0100 (Di, 23 Feb 2010) | 1 line

  #8000: fix deprecated directive.  What a shame to lose that glorious issue number to such a minor bug :)
........
  r78386 | georg.brandl | 2010-02-23 22:48:57 +0100 (Di, 23 Feb 2010) | 1 line

  #6544: fix refleak in kqueue, occurring in certain error conditions.
........
  r78496 | georg.brandl | 2010-02-27 15:58:08 +0100 (Sa, 27 Feb 2010) | 1 line

  Link to http://www.python.org/dev/workflow/ from bugs page.
........
  r78760 | georg.brandl | 2010-03-07 16:23:59 +0100 (So, 07 Mär 2010) | 1 line

  #5341: more built-in vs builtin fixes.
........
  r78771 | georg.brandl | 2010-03-07 21:58:31 +0100 (So, 07 Mär 2010) | 1 line

  #8085: The function is called PyObject_NewVar, not PyObject_VarNew.
........
  r78772 | georg.brandl | 2010-03-07 22:12:28 +0100 (So, 07 Mär 2010) | 1 line

  #8039: document conditional expressions better, giving them their own section.
........
  r78773 | georg.brandl | 2010-03-07 22:32:06 +0100 (So, 07 Mär 2010) | 1 line

  #8044: document Py_{Enter,Leave}RecursiveCall functions.
........
  r78802 | georg.brandl | 2010-03-08 17:28:40 +0100 (Mo, 08 Mär 2010) | 1 line

  Fix typo.
........
2010-03-21 19:29:04 +00:00
Georg Brandl b6453a902e Merged revisions 77120,77151,77155,77209,77229,77256,77317,77331,77333,77359-77360,77382,77561,77570 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77120 | georg.brandl | 2009-12-29 22:09:17 +0100 (Di, 29 Dez 2009) | 1 line

  #7595: fix typo in argument default constant.
........
  r77151 | georg.brandl | 2009-12-30 19:32:50 +0100 (Mi, 30 Dez 2009) | 1 line

  #7487: update Pygments version.
........
  r77155 | georg.brandl | 2009-12-30 20:03:00 +0100 (Mi, 30 Dez 2009) | 1 line

  We only support Windows NT derivatives now.
........
  r77209 | georg.brandl | 2010-01-01 14:07:05 +0100 (Fr, 01 Jan 2010) | 1 line

  More yearly updates.
........
  r77229 | georg.brandl | 2010-01-02 13:35:01 +0100 (Sa, 02 Jan 2010) | 1 line

  Fix casing.
........
  r77256 | georg.brandl | 2010-01-02 23:55:55 +0100 (Sa, 02 Jan 2010) | 1 line

  Fix typo.
........
  r77317 | georg.brandl | 2010-01-05 19:14:52 +0100 (Di, 05 Jan 2010) | 1 line

  Add Stefan.
........
  r77331 | georg.brandl | 2010-01-06 18:43:06 +0100 (Mi, 06 Jan 2010) | 1 line

  Small fixes to test_cmd: fix signature of do_shell, remove duplicate import, add option to run the custom Cmd class.
........
  r77333 | georg.brandl | 2010-01-06 19:26:08 +0100 (Mi, 06 Jan 2010) | 1 line

  #5950: document that zip files with comments are unsupported in zipimport.
........
  r77359 | georg.brandl | 2010-01-07 21:54:45 +0100 (Do, 07 Jan 2010) | 1 line

  Fix description for Py_GetPath(); it sounded like it always returned sys.path.
........
  r77360 | georg.brandl | 2010-01-07 22:48:47 +0100 (Do, 07 Jan 2010) | 1 line

  #7653: clarify how the PythonPath registry key should look like.
........
  r77382 | georg.brandl | 2010-01-09 10:47:11 +0100 (Sa, 09 Jan 2010) | 1 line

  #7422: make it clear that getargspec() only works on Python functions.
........
  r77561 | georg.brandl | 2010-01-17 09:42:30 +0100 (So, 17 Jan 2010) | 1 line

  #7699: improve datetime docs: straightforward linking to strftime/strptime section, mark classmethods as such.
........
  r77570 | georg.brandl | 2010-01-17 13:14:42 +0100 (So, 17 Jan 2010) | 1 line

  Add note about usage of STRINGLIB_EMPTY.
........
2010-03-21 19:16:28 +00:00
Victor Stinner 872d636cc9 Merged revisions 78835-78837,78870 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78835 | victor.stinner | 2010-03-11 13:34:39 +0100 (jeu., 11 mars 2010) | 7 lines

  Issue #7774: Set sys.executable to an empty string if argv[0] has been
  set to an non existent program name and Python is unable to retrieve the real
  program name.

  Fix also sysconfig: if sys.executable is an empty string, use the current
  working directory.
........
  r78836 | victor.stinner | 2010-03-11 14:27:35 +0100 (jeu., 11 mars 2010) | 4 lines

  Fix test_executable introduce in previous commit (r78835): Windows is able to
  retrieve the absolute Python path even if argv[0] has been set to a non
  existent program name.
........
  r78837 | victor.stinner | 2010-03-11 14:46:06 +0100 (jeu., 11 mars 2010) | 3 lines

  Another fix to test_executable() of test_sys: set the current working to avoid
  the #7774 bug.
........
  r78870 | victor.stinner | 2010-03-12 15:30:26 +0100 (ven., 12 mars 2010) | 1 line

  NEWS: issue #7774 is related to Library (sys), not Core and Builtins
........
2010-03-21 13:47:28 +00:00
Victor Stinner bb71dc4396 Merged revisions 78646 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78646 | victor.stinner | 2010-03-04 13:09:33 +0100 (jeu., 04 mars 2010) | 5 lines

  Issue #1054943: Fix unicodedata.normalize('NFC', text) for the Public Review
  Issue #29.

  PR #29 was released in february 2004!
........
2010-03-21 13:41:15 +00:00
Victor Stinner 0217c958f2 Merged revisions 78603 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78603 | victor.stinner | 2010-03-03 00:20:02 +0100 (mer., 03 mars 2010) | 5 lines

  Issue #7820: The parser tokenizer restores all bytes in the right if the BOM
  check fails.

  Fix an assertion in pydebug mode.
........
2010-03-21 13:09:24 +00:00
Matthias Klose a0dc275f08 Revert r79131
- Issue #1039, #8154: Fix os.execlp() crash with missing 2nd argument.
2010-03-21 11:15:45 +00:00
Matthias Klose b8022c8ad1 Merged revisions 79096 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79096 | matthias.klose | 2010-03-19 15:45:06 +0100 (Fr, 19 Mär 2010) | 2 lines

  - Issue #1039, #8154: Fix os.execlp() crash with missing 2nd argument.
........
2010-03-20 02:13:49 +00:00
Gregory P. Smith b608e6f8bb Merged revisions 78718 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78718 | gregory.p.smith | 2010-03-05 23:35:19 -0800 (Fri, 05 Mar 2010) | 3 lines

  Call setreuid and setregid in a subprocess to avoid altering the test runner's
  process state.  Should fix issue8045.
........
2010-03-07 05:58:43 +00:00
Gregory P. Smith 3198098459 issue8053 - logic was inverted on which platforms to run a test on.
caused test_thread to fail on windows.
2010-03-04 18:26:53 +00:00
Senthil Kumaran 7eda9e9082 Reverting the changes made in r78432. Discussed in the tracker issue7540. 2010-03-04 15:15:37 +00:00
Gregory P. Smith 6e064bd1ab Merged revisions 78550 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78550 | gregory.p.smith | 2010-02-28 22:01:02 -0800 (Sun, 28 Feb 2010) | 2 lines

  Fix test to be skipped on windows.
........
2010-03-01 06:03:44 +00:00
Gregory P. Smith 8baa745ceb Merged revisions 78546 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78546 | gregory.p.smith | 2010-02-28 21:43:43 -0800 (Sun, 28 Feb 2010) | 3 lines

  Fixes issue #7999: os.setreuid() and os.setregid() would refuse to accept
  a -1 parameter on some platforms such as OS X.
........
2010-03-01 05:48:57 +00:00