Commit Graph

13775 Commits

Author SHA1 Message Date
Benjamin Peterson e14267bbad merge in the fix for test_ftplib on some bots [reviewed by Georg] 2008-09-28 20:57:21 +00:00
Benjamin Peterson dee0b175f6 backport r66656 so people using -Qnew aren't affected 2008-09-27 22:08:12 +00:00
Benjamin Peterson 003d7463dd enable refactor tests 2008-09-27 21:12:20 +00:00
Benjamin Peterson 08be29193e Merged revisions 66511,66548-66549,66644,66646-66652 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

........
  r66511 | benjamin.peterson | 2008-09-18 21:49:27 -0500 (Thu, 18 Sep 2008) | 1 line

  remove a  useless if __name__ == '__main__'
........
  r66548 | benjamin.peterson | 2008-09-21 21:14:14 -0500 (Sun, 21 Sep 2008) | 1 line

  avoid the perils of mutable default arguments
........
  r66549 | benjamin.peterson | 2008-09-21 21:26:11 -0500 (Sun, 21 Sep 2008) | 1 line

  some places in RefactoringTool should raise an error instead of logging it
........
  r66644 | benjamin.peterson | 2008-09-27 10:45:10 -0500 (Sat, 27 Sep 2008) | 1 line

  fix doctest refactoring
........
  r66646 | benjamin.peterson | 2008-09-27 11:40:13 -0500 (Sat, 27 Sep 2008) | 1 line

  don't print to stdout when 2to3 is used as a library
........
  r66647 | benjamin.peterson | 2008-09-27 12:28:28 -0500 (Sat, 27 Sep 2008) | 1 line

  let fixer modules and classes have different prefixes
........
  r66648 | benjamin.peterson | 2008-09-27 14:02:13 -0500 (Sat, 27 Sep 2008) | 1 line

  raise errors when 2to3 is used as a library
........
  r66649 | benjamin.peterson | 2008-09-27 14:03:38 -0500 (Sat, 27 Sep 2008) | 1 line

  fix docstring
........
  r66650 | benjamin.peterson | 2008-09-27 14:22:21 -0500 (Sat, 27 Sep 2008) | 1 line

  make use of enumerate
........
  r66651 | benjamin.peterson | 2008-09-27 14:24:13 -0500 (Sat, 27 Sep 2008) | 1 line

  revert last revision; it breaks things
........
  r66652 | benjamin.peterson | 2008-09-27 16:03:06 -0500 (Sat, 27 Sep 2008) | 1 line

  add tests for lib2to3.refactor
........
2008-09-27 21:09:10 +00:00
Benjamin Peterson 3c0c483af4 give ftplib a real test suite
A asyncore based mock ftp server is used to test the protocol.
This is all thanks to Giampaolo Rodola #3939

(Barry gave me permission to do this before final on IRC.)
2008-09-27 02:49:54 +00:00
Amaury Forgeot d'Arc fc5ea39289 #3967: Correct a crash in count() and find() methods of string-like objects.
For example:
   "".count("xxxx", sys.maxint, 0)

Reviewed by Benjamin Peterson.
Will port to 2.5 and 3.0.
2008-09-26 22:34:08 +00:00
Raymond Hettinger 6ee7bc04f7 Fix namedtuple bug reported by Glenn Linderman. Template did not form correctly if the field names were input in Unicode. 2008-09-25 23:31:52 +00:00
Amaury Forgeot d'Arc 17617a07d1 #3965: on Windows, open() crashes if the filename or the mode is invalid,
and if the filename is a unicode string.

Reviewed by Martin von Loewis.
2008-09-25 20:52:56 +00:00
Benjamin Peterson 52d52f185a #3950 fix missing scale factors in turtle.py
reviewers: Georg, Benjamin
2008-09-24 22:11:59 +00:00
Thomas Heller a85c95d5e8 Fix issue #3547: ctypes is confused by bitfields of varying integer types
Reviewed by Fredrik Lundh and Skip Montanaro.
2008-09-24 18:26:05 +00:00
Benjamin Peterson a74d675fac backport the atexit test for r66563 2008-09-23 20:43:09 +00:00
Jesus Cea 5cd5f12a48 Bugfix for issue3885 and 'DB.verify()' crash.
Reviewed by Nick Coghlan.
2008-09-23 18:54:08 +00:00
Benjamin Peterson ffb3cca39b use the new threading properties for multiprocessing (reviewed by Jesse #3927) 2008-09-22 21:11:43 +00:00
Andrew MacIntyre 41c56b5ea1 build_os2emx.patch in issue 3868 - update OS/2 EMX makefile and config files
Part of source_os2emx.patch in issue 3868:
  Include/pystrcmp.h:  OS/2 has same C APIs as Windows
  Lib/test/test_io.py: OS/2 has same behaviour as Windows for this test

Reviewed by Amaury Forgeot d'Arc
2008-09-22 14:23:45 +00:00
Benjamin Peterson 2c7470d951 #3879 fix a regression in urllib.getproxies_environment
reviewers: Benjamin, Georg
2008-09-21 21:27:51 +00:00
Hirokazu Yamamoto 1672e10dc2 Issue #3925: Ignores shutil.rmtree error on cygwin too.
Reviewed by Benjamin Peterson.
2008-09-21 20:48:41 +00:00
Hirokazu Yamamoto 56d380de1d Issue #3838: TarFile object assigned to self.tar should be closed explicitly.
Reviewed by Lars Gustäbel.
2008-09-21 11:44:23 +00:00
Barry Warsaw 6af16190f6 Bumping to 2.6rc2 2008-09-18 04:33:43 +00:00
Mark Hammond 900155fa42 avoid putting unicode objects in the environment causing
later test failures.  As discussed on #python-dev
2008-09-18 03:51:46 +00:00
Mark Hammond 9f381ec50b On Windows, temporarily disable the bsddb test referenced in bug 3892.
We do yell to stderr and the bug is marked as a blocker.
Reviewed by barry in #python-dev.
2008-09-18 02:47:35 +00:00
Benjamin Peterson 8c2b7dc463 fix possible integer overflows in _hashopenssl #3886 2008-09-18 01:22:16 +00:00
Benjamin Peterson c237f8e0ce Merged revisions 66470 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

........
  r66470 | benjamin.peterson | 2008-09-15 18:29:43 -0500 (Mon, 15 Sep 2008) | 1 line

  don't use os.linesep for newlines; it breaks tests on windows
........
2008-09-15 23:55:01 +00:00
Benjamin Peterson d51e07f989 Merged revisions 66191,66418,66438,66445 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

........
  r66191 | benjamin.peterson | 2008-09-03 17:00:52 -0500 (Wed, 03 Sep 2008) | 1 line

  update the Grammar file after recent syntax changes
........
  r66418 | benjamin.peterson | 2008-09-12 18:49:48 -0500 (Fri, 12 Sep 2008) | 1 line

  a trival fix to get a few more print corner cases #2899
........
  r66438 | benjamin.peterson | 2008-09-12 21:32:30 -0500 (Fri, 12 Sep 2008) | 5 lines

  add Jack Diederich's fixer for metaclass syntax #2366

  my contribution to this was adding a few tests and fixing a few bugs
  I also reviewed it (Jack is a committer)
........
  r66445 | benjamin.peterson | 2008-09-13 10:50:00 -0500 (Sat, 13 Sep 2008) | 1 line

  add a few more tests concerning int literals and weird spacing
........
2008-09-13 17:43:19 +00:00
Barry Warsaw 1e62aec3ed Bumping to 2.6rc1 2008-09-12 23:25:57 +00:00
Nick Coghlan d2e0938362 Issue #3781: Final cleanup of warnings.catch_warnings and its usage in the test suite. Closes issue w.r.t. 2.6 (R: Brett Cannon) 2008-09-11 12:11:06 +00:00
Martin v. Löwis 4dd3a50ca4 Read unidata_version from unicodedata module.
Delete old NormalizationTest.txt if it doesn't match
unidata_version.
2008-09-10 19:16:35 +00:00
Martin v. Löwis 6d5ec2474d Update to test Unicode 5.1. 2008-09-10 18:43:49 +00:00
Guido van Rossum e3c4fd9cc0 - Issue #3629: Fix sre "bytecode" validator for an end case.
Reviewed by Amaury.
2008-09-10 14:27:00 +00:00
Martin v. Löwis 24329ba176 Issue #3811: The Unicode database was updated to 5.1.
Reviewed by Fredrik Lundh and Marc-Andre Lemburg.
2008-09-10 13:38:12 +00:00
Benjamin Peterson 97179b0f58 Fix #3634 invalid return value from _weakref.ref(Exception).__init__
Reviewers: Amaury, Antoine, Benjamin
2008-09-09 20:55:01 +00:00
Vinay Sajip 844f741039 Issue #3809: Fixed spurious 'test.blah' file left behind by test_logging. 2008-09-09 13:42:08 +00:00
Amaury Forgeot d'Arc d3ffb8974f #3777: long(4.2) returned an int, and broke backward compatibility.
the __long__ slot is allowed to return either int or long, but the behaviour of
float objects should not change between 2.5 and 2.6.

Reviewed by Benjamin Peterson
2008-09-09 07:24:30 +00:00
Brett Cannon 672237dc6c warnings.catch_warnings() now returns a list or None instead of the custom
WarningsRecorder object. This makes the API simpler to use as no special object
must be learned.

Closes issue 3781.
Review by Benjamin Peterson.
2008-09-09 00:49:16 +00:00
Hirokazu Yamamoto 631be01252 Issue #3806: LockTests in test_imp should be skipped when thread is not available.
Reviewed by Benjamin Peterson.
2008-09-08 23:38:42 +00:00
Hirokazu Yamamoto 74ce88fd67 Issue #3804: Added test for Issue #2222.
Reviewed by Benjamin Peterson.
2008-09-08 23:03:47 +00:00
Bill Janssen 61c001a939 incorporate fixes from issue 3162; SSL doc patch 2008-09-08 16:37:24 +00:00
Facundo Batista ace0bcf669 Issue 3801. Fixing a dumb error in the deprecated parse_qsl()
function.  Tests added.
2008-09-08 00:20:28 +00:00
Josiah Carlson b7a841ca40 undoing change that broke trunk. Need to find a better solution to this. 2008-09-07 04:37:10 +00:00
Josiah Carlson 1680b8c16c This fixes a small inconsistency between trunk and 3.0, closing bug 3764. 2008-09-07 03:53:58 +00:00
Benjamin Peterson a853a89dc3 fix missing module 2008-09-06 23:19:15 +00:00
Antoine Pitrou 9fb1aca5d8 Backport relevant part of r66274 (in issue #874900). 2008-09-06 23:04:32 +00:00
Amaury Forgeot d'Arc feb8cade4d #3796: A test class was not run in test_float.
Reviewed by Benjamin.
2008-09-06 20:53:51 +00:00
Benjamin Peterson 6ac7d7c80b #1638033: add support for httponly on Cookie.Morsel
Reviewer: Benjamin
2008-09-06 19:28:11 +00:00
Antoine Pitrou ebcd0ced14 Issue #3535: zipfile couldn't read some zip files larger than 2GB.
Reviewed by Amaury Forgeot d'Arc.
2008-09-05 23:30:23 +00:00
Antoine Pitrou 187ac1bda4 #3601: test_unicode.test_raiseMemError fails in UCS4
Reviewed by Benjamin Peterson on IRC.
2008-09-05 22:04:54 +00:00
Brett Cannon 32476fc5a8 Deprecate bsddb for removal in Python 3.0.
Closes issue 3776.
Review by Nick Coghlan.
2008-09-05 18:33:51 +00:00
Hirokazu Yamamoto 171c4aae4e Issue #3762: platform.architecture() fails if python is lanched via its symbolic link.
Reviewed by Amaury Forgeot d'Arc.
2008-09-04 11:15:14 +00:00
Vinay Sajip 65d66e1006 Issue #3772: Fixed regression problem in StreamHandler.emit(). 2008-09-04 07:31:21 +00:00
Brett Cannon a0b7444f68 test_py3kwarn had been overlooked when test.test_support.catch_warning() was
re-implemented to use warnings.catch_warnings() and had its API improved.

Closes issue #3768.
Code review by Benjamin Peterson.
2008-09-03 22:45:11 +00:00
Facundo Batista c585df9476 Issue 600362: Relocated parse_qs() and parse_qsl(), from the cgi module
to the urlparse one.  Added a PendingDeprecationWarning in the old
module, it will be deprecated in the future.  Docs and tests updated.
2008-09-03 22:35:50 +00:00
Jesus Cea 69acb43327 Python3.0 bsddb testsuite compatibility improvements 2008-09-03 22:07:11 +00:00
Marc-André Lemburg b339b2aa6f Issue #2562: Fix distutils PKG-INFO writing logic to allow having
non-ascii characters and Unicode in setup.py meta-data.
2008-09-03 11:13:56 +00:00
Vinay Sajip 6a2fd81316 Issue #3726: Allowed spaces in separators in logging configuration files. 2008-09-03 09:20:05 +00:00
Benjamin Peterson 0151b5350b Merged revisions 66176 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

........
  r66176 | benjamin.peterson | 2008-09-02 21:04:06 -0500 (Tue, 02 Sep 2008) | 1 line

  fix typo
........
2008-09-03 02:14:03 +00:00
Benjamin Peterson eb55fd8d2f Merged revisions 66173 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

........
  r66173 | benjamin.peterson | 2008-09-02 18:57:48 -0500 (Tue, 02 Sep 2008) | 8 lines

  A little 2to3 refactoring #3637

  This moves command line logic from refactor.py to a new file called
  main.py.  RefactoringTool now merely deals with the actual fixers and
  refactoring; options processing for example is abstracted out.

  This patch was reviewed by Gregory P. Smith.
........
2008-09-03 00:21:32 +00:00
Amaury Forgeot d'Arc 293924bf31 Issue 2975: when compiling multiple extension modules with visual studio 2008
from the same python instance, some environment variables (LIB, INCLUDE)
would grow without limit.

Tested with these statements:
    distutils.ccompiler.new_compiler().initialize()
    print os.environ['LIB']
But I don't know how to turn them into reliable unit tests.
2008-09-02 23:19:56 +00:00
Hirokazu Yamamoto 3e7dd78344 Issue #3759: test_asyncore.py leaked handle.
Reviewed by Amaury Forgeot d'Arc
2008-09-02 20:36:44 +00:00
Marc-André Lemburg d15fad7a89 Add quotes around the file name to avoid issues with spaces.
Closes #3719.
2008-09-02 10:32:34 +00:00
Nick Coghlan 91ae3ea2b4 Issue 3747: Fix caching in ABCMeta.__subclasscheck__ (R: Georg Brandl) 2008-09-02 10:14:47 +00:00
Gregory P. Smith d712203d17 Issue #3708: os.urandom no longer goes into an infinite loop when passed a
non-integer floating point number.
2008-09-02 05:36:11 +00:00
Jesus Cea 3b6be74304 Improve compatibility with Python3.0 testsuite 2008-09-02 02:29:06 +00:00
Brett Cannon 1eaf0742d8 Move test.test_support.catch_warning() to the warnings module, rename it
catch_warnings(), and clean up the API.

While expanding the test suite, a bug was found where a warning about the
'line' argument to showwarning() was not letting functions with '*args' go
without a warning.

Closes issue 3602.
Code review by Benjamin Peterson.
2008-09-02 01:25:16 +00:00
Benjamin Peterson 973e6c2cf3 remove py3k warnings about the threading api; update docs
Reviewer: Benjamin Peterson
2008-09-01 23:12:58 +00:00
Jesus Cea 057dfddc88 In Python3.0, "test.test_support" is renamed to "test.support". 2008-09-01 20:48:16 +00:00
Amaury Forgeot d'Arc 3571fbfed7 Issue #3751: str.rpartition would perform a left-partition when called with
a unicode argument.

will backport.
2008-09-01 19:52:00 +00:00
Benjamin Peterson e5c1d294b1 Merged revisions 65887,65889,65967-65968,65981 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

........
  r65887 | benjamin.peterson | 2008-08-19 17:45:04 -0500 (Tue, 19 Aug 2008) | 1 line

  allow the raw_input fixer to handle calls after the raw_input (ie. raw_input().split())
........
  r65889 | benjamin.peterson | 2008-08-19 18:11:03 -0500 (Tue, 19 Aug 2008) | 1 line

  no need for 2.4 compatibility now
........
  r65967 | benjamin.peterson | 2008-08-21 18:43:37 -0500 (Thu, 21 Aug 2008) | 1 line

  allow a Call to have no arguments
........
  r65968 | benjamin.peterson | 2008-08-21 18:45:13 -0500 (Thu, 21 Aug 2008) | 1 line

  add a fixer for sys.exc_info etc by Jeff Balogh #2357
........
  r65981 | benjamin.peterson | 2008-08-22 15:41:30 -0500 (Fri, 22 Aug 2008) | 1 line

  add a fixer to add parenthese for list and gen comps #2367
........
2008-09-01 17:17:22 +00:00
Benjamin Peterson f7feaec16c revert r66114 for Jesse 2008-09-01 17:10:46 +00:00
Jesse Noller 27cc8e1dd2 Submit Nick's patch for issue 3589, reviewed by jnoller 2008-09-01 16:47:25 +00:00
Hirokazu Yamamoto ed8c6441b5 Issue #3748: platform.architecture() printed vogus message on windows.
Reviewed by Marc-Andre Lemburg.
2008-09-01 14:32:58 +00:00
Vinay Sajip 72ed07843a logging: fixed lack of use of encoding attribute specified on a stream. 2008-09-01 14:30:10 +00:00
Hirokazu Yamamoto f7dd75f484 Issue #3732: Backported r53335 to supress deprecation warning.
Reviewed by Benjamin Peterson.
2008-09-01 14:24:04 +00:00
Benjamin Peterson f22c26ecf4 #3703 unhelpful _fileio.FileIO error message when trying to open a directory
Reviewer: Gregory P. Smith
2008-09-01 14:13:43 +00:00
Gregory P. Smith f07e5a9e4b issue3715: docstring representation of hex escaped string needs to be double
escaped.
2008-08-31 16:34:18 +00:00
Jesus Cea 4907d27c1f Update bsddb code to version 4.7.3pre2. This code should
be compatible with Python 3.0, also.

  http://www.jcea.es/programacion/pybsddb.htm#bsddb3-4.7.3
2008-08-31 14:00:51 +00:00
Georg Brandl 5c669db194 #3707: fix inf. recursion in pydoc topic search. Rev'd by Antoine. 2008-08-30 19:03:43 +00:00
Armin Rigo dcde494114 A collection of crashers, all variants of the idea
of issue #3720.
2008-08-29 21:21:52 +00:00
Antoine Pitrou 0668c62677 Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to
match Python 2.5 speed despite the __instancecheck__ / __subclasscheck__
mechanism. In the process, fix a bug where isinstance() and issubclass(),
when given a tuple of classes as second argument, were looking up
__instancecheck__ / __subclasscheck__ on the tuple rather than on each
type object.

Reviewed by Benjamin Peterson and Raymond Hettinger.
2008-08-26 22:42:08 +00:00
Neal Norwitz e39be53c3c Try to reduce the flakiness of this test 2008-08-25 03:52:40 +00:00
Neal Norwitz 2a7767a173 Use bytes as return type from recv_bytes() methods. Not sure why this only
affects some buildbots.

R=Brett
TESTED=./python -E -tt ./Lib/test/regrtest.py test_multiprocessing
2008-08-25 03:03:25 +00:00
Neal Norwitz 0c519b3a5e Fix problem reported by pychecker where AuthenticationError wasn't imported.
Add some test coverage to this code.  More tests should be added (TODO added).

R=Brett
TESTED=./python -E -tt ./Lib/test/regrtest.py test_multiprocessing
2008-08-25 01:50:24 +00:00
Neal Norwitz 901e4715bd #3662: Fix segfault introduced when fixing memory leaks.
TESTED=./python -E -tt ./Lib/test/regrtest.py test_fileio
R (approach from bug)=Amaury and Benjamin
2008-08-24 22:03:05 +00:00
Georg Brandl 30de77b97d #3654: fix duplicate test method name. Review by Benjamin P. 2008-08-24 18:11:07 +00:00
Benjamin Peterson 712ee92309 generate py3k warnings on __getslice__, __delslice__, and __setslice__
Reviewer: Brett Cannon
2008-08-24 18:10:20 +00:00
Neal Norwitz 18aa388ca0 Fix:
* crashes on memory allocation failure found with failmalloc
 * memory leaks found with valgrind
 * compiler warnings in opt mode which would lead to invalid memory reads
 * problem using wrong name in decimal module reported by pychecker

Update the valgrind suppressions file with new leaks that are small/one-time
leaks we don't care about (ie, they are too hard to fix).

TBR=barry
TESTED=./python -E -tt ./Lib/test/regrtest.py -uall (both debug and opt modes)
  in opt mode:
  valgrind -q --leak-check=yes --suppressions=Misc/valgrind-python.supp \
    ./python -E -tt ./Lib/test/regrtest.py -uall,-bsddb,-compiler \
                        -x test_logging test_ssl test_multiprocessing
  valgrind -q --leak-check=yes --suppressions=Misc/valgrind-python.supp \
    ./python -E -tt ./Lib/test/regrtest.py test_multiprocessing
  for i in `seq 1 4000` ; do
    LD_PRELOAD=~/local/lib/libfailmalloc.so FAILMALLOC_INTERVAL=$i \
        ./python -c pass
  done

At least some of these fixes should probably be backported to 2.5.
2008-08-24 05:04:52 +00:00
Mark Hammond 69ed524045 Fix bug 3625: test issues on 64bit windows. r=pitrou 2008-08-23 00:59:14 +00:00
Benjamin Peterson b6a955672f fix a few get_name() calls and turn then to .name
Reviewer: Christian Heimes
2008-08-22 20:43:48 +00:00
Robert Schuppenies af1aae3aa6 Issue #1342811: Fixed broken patch. Reviewed by benjamin.peterson. 2008-08-22 08:03:43 +00:00
Mark Dickinson 892429b08b Fix float.fromhex test to give additional information on failure. This
change is aimed at diagnosing issue 3633 (test_float fails on Solaris).

Reviewed by Benjamin Peterson
2008-08-21 20:02:24 +00:00
Barry Warsaw 07a4a3851d Bump to 2.6b3. 2008-08-21 01:15:08 +00:00
Hirokazu Yamamoto cd3b74d4e8 Reverted r65900. See http://mail.python.org/pipermail/python-checkins/2008-August/073116.html 2008-08-20 16:15:28 +00:00
Hirokazu Yamamoto 838c79f472 Issue #3612: Added some missing basic types in ctypes.wintypes. 2008-08-20 13:14:07 +00:00
Hirokazu Yamamoto ccfdcd0cb2 fixed get_file_system in test_os.py ('path' is unicode on py3k and ansi on trunk) 2008-08-20 04:13:28 +00:00
Benjamin Peterson e6b5ba621f fix silly errors of mine 2008-08-20 02:15:42 +00:00
Benjamin Peterson 86da890a9e newSymbolTable is not public API 2008-08-20 01:44:45 +00:00
Benjamin Peterson e977ad4d7b deprecate some useless, noop methods in symtable 2008-08-20 01:42:01 +00:00
Amaury Forgeot d'Arc 67f24f1ed6 follow-up of issue3473: update the compiler package to recognize the new syntax. 2008-08-20 00:08:47 +00:00
Benjamin Peterson bd6a05fe81 check that the parser module can handle the new keyword syntax 2008-08-19 22:06:11 +00:00
Benjamin Peterson bd7bda4345 Merged revisions 65876 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

........
  r65876 | benjamin.peterson | 2008-08-19 15:54:52 -0500 (Tue, 19 Aug 2008) | 1 line

  apply a fix I think will help Windows
........
2008-08-19 21:07:15 +00:00
Benjamin Peterson 80f0ed5bb1 allow keyword args to be passed in after *args #3473 2008-08-19 19:52:46 +00:00
Thomas Heller 0ad5ae02af Fix a regression introduced by rev. 63792: ctypes function pointers
that are COM methods must have a boolean True value.
2008-08-19 19:25:04 +00:00