Commit Graph

36036 Commits

Author SHA1 Message Date
Trent Nelson 61828c725a Merged revisions 62129,62131,62133 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62129 | trent.nelson | 2008-04-03 19:27:06 +0100 (Thu, 03 Apr 2008) | 16 lines

  Reimplement kill_python.  The existing version had a number of flaws, namely, it didn't work for x64 and it wasn't precise about which python_d.exe it was killing -- it just killed the first one it came across that happened to have 'pcbuild\python_d.exe' or 'build\python_d.exe' in it's path.  The new version has been rewritten from the ground up and now lives in PCbuild, instead of Tools\buildbot, and it has also been incorporated into the Visual Studio solution (pcbuild.sln) as 'kill_python'.  The solution has also been altered such that kill_python is called where necessary in the build process in order to prevent any linking errors due to open file locks.  In lieu of this, all of the existing bits and pieces in Tools\buildbot that called out to kill_python at various points have also been removed as they are now obsolete.  Tested on both Win32 and x64.

  Change set (included to improve usefulness of svnmerge log entry):
  M      PCbuild\pythoncore.vcproj
  M      PCbuild\pcbuild.sln
  M      PCbuild\release.vsprops
  A      PCbuild\kill_python.vcproj
  M      PCbuild\debug.vsprops
  A      PCbuild\kill_python.c
  D      Tools\buildbot\kill_python.bat
  D      Tools\buildbot\kill_python.mak
  M      Tools\buildbot\build.bat
  D      Tools\buildbot\Makefile
  M      Tools\buildbot\build-amd64.bat
  M      Tools\buildbot\buildmsi.bat
  D      Tools\buildbot\kill_python.c
........
  r62131 | trent.nelson | 2008-04-03 19:48:53 +0100 (Thu, 03 Apr 2008) | 1 line

  Add the correct OutputFile values for debug builds.  Fixes r62129's commit.
........
  r62133 | trent.nelson | 2008-04-03 21:00:08 +0100 (Thu, 03 Apr 2008) | 1 line

  Make kill_python a little more forgiving if it can't obtain a snapshot of module information for a given python[_d].exe process.  Failing here was too pessimistic; the python[_d].exe process may be owned by another user, which is the case in some buildbot environments.
........
2008-04-03 20:47:30 +00:00
Trent Nelson f12e541174 Unblock revision 62129. 2008-04-03 20:44:03 +00:00
Benjamin Peterson 1b8f2b1a5c Blocked revisions 62123,62126 via svnmerge
........
  r62123 | barry.warsaw | 2008-04-02 23:10:02 -0500 (Wed, 02 Apr 2008) | 2 lines

  Updating for 2.6a2
........
  r62126 | barry.warsaw | 2008-04-02 23:14:19 -0500 (Wed, 02 Apr 2008) | 1 line

  Post tag version tweak
........
2008-04-03 19:48:41 +00:00
Trent Nelson 428ca594a4 [XXX: this is a temporary block, given the addition/deletion of new files I'll unblock and merge it to py3k myself once I've observed trunk buildbots' behaviour.]
Blocked revisions 62129 via svnmerge

........
  r62129 | trent.nelson | 2008-04-03 19:27:06 +0100 (Thu, 03 Apr 2008) | 16 lines

  Reimplement kill_python.  The existing version had a number of flaws, namely, it didn't work for x64 and it wasn't precise about which python_d.exe it was killing -- it just killed the first one it came across that happened to have 'pcbuild\python_d.exe' or 'build\python_d.exe' in it's path.  The new version has been rewritten from the ground up and now lives in PCbuild, instead of Tools\buildbot, and it has also been incorporated into the Visual Studio solution (pcbuild.sln) as 'kill_python'.  The solution has also been altered such that kill_python is called where necessary in the build process in order to prevent any linking errors due to open file locks.  In lieu of this, all of the existing bits and pieces in Tools\buildbot that called out to kill_python at various points have also been removed as they are now obsolete.  Tested on both Win32 and x64.

  Change set (included to improve usefulness of svnmerge log entry):
  M      PCbuild\pythoncore.vcproj
  M      PCbuild\pcbuild.sln
  M      PCbuild\release.vsprops
  A      PCbuild\kill_python.vcproj
  M      PCbuild\debug.vsprops
  A      PCbuild\kill_python.c
  D      Tools\buildbot\kill_python.bat
  D      Tools\buildbot\kill_python.mak
  M      Tools\buildbot\build.bat
  D      Tools\buildbot\Makefile
  M      Tools\buildbot\build-amd64.bat
  M      Tools\buildbot\buildmsi.bat
  D      Tools\buildbot\kill_python.c
........
2008-04-03 18:39:00 +00:00
Benjamin Peterson 7afb766c5d #2541 Allow unicode escapes in raw strings 2008-04-03 16:27:27 +00:00
Barry Warsaw f95ecf7b15 Post tag version tweak 2008-04-03 04:13:12 +00:00
Barry Warsaw 84f5718e8b Tagging 3.0a4. 2008-04-02 23:47:54 +00:00
Barry Warsaw bb5cd08688 release.py induced and manual editing steps for 3.0a4. 2008-04-02 23:33:27 +00:00
Barry Warsaw dd15bcd581 release.py wants to rename the spec file. 2008-04-02 22:51:13 +00:00
Benjamin Peterson ec79aad427 Fixed NEWS due to my bad merging skills 2008-04-02 22:44:10 +00:00
Benjamin Peterson ad9d48d865 Merged revisions 62090-62091,62096,62100,62102,62110-62114 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62090 | brett.cannon | 2008-04-01 07:37:43 -0500 (Tue, 01 Apr 2008) | 3 lines

  Generalize test.test_support.test_stdout() with a base context manager so that
  it is easy to capture stderr if desired.
........
  r62091 | brett.cannon | 2008-04-01 07:46:02 -0500 (Tue, 01 Apr 2008) | 3 lines

  Add ``if __name__ == '__main__'`` to some test files where it didn't take a lot
  of effort to do so.
........
  r62096 | amaury.forgeotdarc | 2008-04-01 17:52:48 -0500 (Tue, 01 Apr 2008) | 4 lines

  Newly enabled test appears to leak:
  it registers the same codec on each iteration.
  Do it only once at load time.
........
  r62100 | amaury.forgeotdarc | 2008-04-01 19:55:04 -0500 (Tue, 01 Apr 2008) | 4 lines

  A DocTestSuite cannot run multiple times: it clears its globals dictionary after the first run.

  Rebuild the DocTestSuite on each iteration.
........
  r62102 | jeffrey.yasskin | 2008-04-01 23:07:44 -0500 (Tue, 01 Apr 2008) | 3 lines

  Try to make test_signal less flaky.  I still see some flakiness in
  test_itimer_prof.
........
  r62110 | vinay.sajip | 2008-04-02 16:09:27 -0500 (Wed, 02 Apr 2008) | 1 line

  Fix: #2315, #2316, #2317: TimedRotatingFileHandler - changed logic to better handle daylight savings time, deletion of old log files, and fixed a bug in calculating rollover when no logging occurs for a longer interval than the rollover period.
........
  r62111 | vinay.sajip | 2008-04-02 16:10:23 -0500 (Wed, 02 Apr 2008) | 1 line

  Added updates with respect to recent changes to TimedRotatingFileHandler.
........
  r62112 | vinay.sajip | 2008-04-02 16:17:25 -0500 (Wed, 02 Apr 2008) | 1 line

  Added updates with respect to recent changes to TimedRotatingFileHandler.
........
  r62113 | amaury.forgeotdarc | 2008-04-02 16:18:46 -0500 (Wed, 02 Apr 2008) | 2 lines

  Remove debug prints; the buildbot now passes the tests
........
  r62114 | benjamin.peterson | 2008-04-02 16:20:35 -0500 (Wed, 02 Apr 2008) | 2 lines

  Suggested proposed changes to Python be considered on some mailing lists first
........
2008-04-02 21:49:44 +00:00
Benjamin Peterson 84bea688c2 Blocked revisions 62097 via svnmerge
........
  r62097 | guido.van.rossum | 2008-04-01 18:57:36 -0500 (Tue, 01 Apr 2008) | 3 lines

  Remove the advertising clause from the BSD license in timing.h.
  I have the email trail to prove that George Neville-Neil approved this.
........
2008-04-02 21:21:29 +00:00
Trent Nelson 5203727cdc Merged revisions 62105 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62105 | trent.nelson | 2008-04-02 16:01:00 +0100 (Wed, 02 Apr 2008) | 1 line

  Update information pertaining to building external components, as well as notes on x64 builds.  This file now accurately describes the build process as is; however, there's still a lot of room for improvement, especially with regards to how we build Tcl/Tk, Tix, and OpenSSL.  Watch this space for further improvements.
........
2008-04-02 15:06:49 +00:00
Neal Norwitz 8b326a8ebb Blocked revisions 62103 via svnmerge
........
  r62103 | neal.norwitz | 2008-04-01 22:54:27 -0700 (Tue, 01 Apr 2008) | 3 lines

  Apply same patch from 3k branch to try and prevent this test from hanging
  on various platforms, most recently the Alpha Tru64.
........
2008-04-02 07:06:14 +00:00
Benjamin Peterson ba756b5a2b Blocked revisions 62095,62099 via svnmerge
........
  r62095 | amaury.forgeotdarc | 2008-04-01 17:37:33 -0500 (Tue, 01 Apr 2008) | 5 lines

  Fix and enable a skipped test:
  with python 2.6, enumerating bytes yields 1-char strings, not numbers.

  Don't merge this into the py3k branch.
........
  r62099 | amaury.forgeotdarc | 2008-04-01 19:25:14 -0500 (Tue, 01 Apr 2008) | 14 lines

  Correct the apparent refleak in test_io:
  When cls is an ABCMeta, every call to isinstance(x, cls)
  records type(x) in the cls._abc_cache of cls_abc_negative_cache.
  So we clear these caches at the end of the test.

  inspect.isabstract() is not the correct test for all ABCs, because there is no @abstractmethod in io.py (why?)
  isinstance(cls, ABCMeta) would be more exact, but it fails with an infinite recursion.
  So I used a hack to determine whether a class is an ABCMeta.

  The true correction would be to turn cls._abc_cache &co into a WeakSet, as py3k does.
  But classic classes are not weak referenceable...

  Of course, this change should not be merged into the py3k branch.
........
2008-04-02 02:27:22 +00:00
Amaury Forgeot d'Arc b4febc7933 Prevent test_queue from leaking: one worker thread was not stopped.
The version in trunk/ is correct; the problem with 3.0 is that
None cannot be used as a marker in a PriorityQueue, because it cannot be compared with ints.
2008-04-01 21:23:34 +00:00
Neal Norwitz 36e6310e39 Fix refleak with nested classes. Fix originally by Amaury in r62015. 2008-04-01 08:08:09 +00:00
Neal Norwitz f7276c9b0e Be more forgiving if we get an error, there are lots of potential socket errors 2008-04-01 07:38:41 +00:00
Neal Norwitz d2bee32e9e Fix a refleak 2008-04-01 07:37:58 +00:00
Martin v. Löwis e1e9f235c2 Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62055-62058,62060-62066,62068-62074,62076-62085 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

................
  r62080 | martin.v.loewis | 2008-03-31 07:20:55 +0200 (Mo, 31 Mär 2008) | 9 lines

  Merged revisions 61990-62079 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

  ........
    r62017 | david.wolever | 2008-03-28 21:54:37 +0100 (Fr, 28 Mär 2008) | 1 line

    Fixed an out-of-date comment.
  ........
................
  r62084 | benjamin.peterson | 2008-03-31 23:57:13 +0200 (Mo, 31 Mär 2008) | 2 lines

  PyErr_Warn is decrepated. Use PyErr_WarnEx
................
  r62085 | neal.norwitz | 2008-04-01 07:40:43 +0200 (Di, 01 Apr 2008) | 4 lines

  Be sure to close the file.  2 places were deleting the file, so it was probably
  fine, but the last change may be required for the test to pass on Windows.
  Should we always close the mmap too?
................
2008-04-01 06:17:46 +00:00
Neal Norwitz f9ff5f02d4 This was required on OS X to prevent the test from deadlocking. I'm not sure
if this is just a test problem or something deeper.  Hopefully the test will
stop hanging.
2008-03-31 05:39:26 +00:00
Neal Norwitz ee9b10a987 Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62048 | georg.brandl | 2008-03-29 23:53:55 -0700 (Sat, 29 Mar 2008) | 2 lines

  Adapt test_ast to the new ExceptHandler type.
........
  r62050 | georg.brandl | 2008-03-30 00:09:22 -0700 (Sun, 30 Mar 2008) | 2 lines

  Convert test_ast to unittest and add a test for r62049.
........
  r62051 | georg.brandl | 2008-03-30 12:00:49 -0700 (Sun, 30 Mar 2008) | 2 lines

  Make _fields attr for no fields consistent with _attributes attr.
........
  r62059 | georg.brandl | 2008-03-30 13:20:39 -0700 (Sun, 30 Mar 2008) | 2 lines

  Make AST nodes pickleable.
........
2008-03-31 05:29:39 +00:00
Neal Norwitz ad74aa8dc0 Merged revisions 62047 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62047 | georg.brandl | 2008-03-29 23:40:17 -0700 (Sat, 29 Mar 2008) | 2 lines

  Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum.
........
2008-03-31 05:14:30 +00:00
Neal Norwitz d35759388b Blocked revisions 62075 via svnmerge
........
  r62075 | neal.norwitz | 2008-03-30 21:28:40 -0700 (Sun, 30 Mar 2008) | 1 line

  Use file.write instead of print to make it easier to merge with 3k.
........
2008-03-31 04:47:25 +00:00
Neal Norwitz 207c9f3c5c Merged revisions 62049,62054 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62049 | georg.brandl | 2008-03-30 00:01:47 -0700 (Sun, 30 Mar 2008) | 2 lines

  #2505: allow easier creation of AST nodes.
........
  r62054 | georg.brandl | 2008-03-30 12:43:27 -0700 (Sun, 30 Mar 2008) | 2 lines

  Fix error message -- "expects either 0 or 0 arguments"
........
2008-03-31 04:42:11 +00:00
Neal Norwitz db4115ffc0 Merged revisions 62039-62042 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62039 | georg.brandl | 2008-03-29 06:24:23 -0700 (Sat, 29 Mar 2008) | 3 lines

  Properly check for consistency with the third argument of
  compile() when compiling an AST node.
........
  r62040 | amaury.forgeotdarc | 2008-03-29 06:47:05 -0700 (Sat, 29 Mar 2008) | 5 lines

  The buildbot "x86 W2k8 trunk" seems to hang in test_socket.
  http://www.python.org/dev/buildbot/trunk/x86%20W2k8%20trunk/builds/255/step-test/0

  Temporarily increase verbosity of this test.
........
  r62042 | amaury.forgeotdarc | 2008-03-29 07:53:05 -0700 (Sat, 29 Mar 2008) | 3 lines

  Still investigating on the hanging test_socket.
  the test itself doesn't do anything on windows, focus on setUp and tearDown.
........
2008-03-31 04:20:05 +00:00
Neal Norwitz 9367c78c84 Blocked revisions 62020 via svnmerge
........
  r62020 | amaury.forgeotdarc | 2008-03-28 15:43:38 -0700 (Fri, 28 Mar 2008) | 5 lines

  One #ifdef too much, and I broke all windows buildbots:
  in pyconfig.h, NTDDI_WIN2KSP4 is not *yet* defined, but will be at some point on some modules.

  Let this line even for older SDKs, they don't use it anyway.
........
2008-03-31 03:02:08 +00:00
Neal Norwitz fe4ce56062 Revert r62070 due to syntax errors 2008-03-31 02:56:33 +00:00
Neal Norwitz 94fa2ee734 Revert r62070 due to syntax errors 2008-03-31 02:55:15 +00:00
Benjamin Peterson 4fde0c4036 Rolled back revisions 62038 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
This was incorrectly merged.
2008-03-31 02:36:22 +00:00
Benjamin Peterson 2a691a8149 Merged revisions 62021,62029,62035-62038,62043-62044,62052-62053 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62021 | benjamin.peterson | 2008-03-28 18:11:01 -0500 (Fri, 28 Mar 2008) | 2 lines

  NIL => NULL
........
  r62029 | amaury.forgeotdarc | 2008-03-28 20:42:31 -0500 (Fri, 28 Mar 2008) | 3 lines

  Correctly call the base class tearDown();
  otherwise running test_logging twice produce the errors we see on all buildbots
........
  r62035 | raymond.hettinger | 2008-03-29 05:42:07 -0500 (Sat, 29 Mar 2008) | 1 line

  Be explicit about what efficient means.
........
  r62036 | georg.brandl | 2008-03-29 06:46:18 -0500 (Sat, 29 Mar 2008) | 2 lines

  Fix capitalization.
........
  r62037 | amaury.forgeotdarc | 2008-03-29 07:42:54 -0500 (Sat, 29 Mar 2008) | 5 lines

  lib2to3 should install a logging handler only when run as a main program,
  not when used as a library.

  This may please the buildbots, which fail when test_lib2to3 is run before test_logging.
........
  r62043 | benjamin.peterson | 2008-03-29 10:24:25 -0500 (Sat, 29 Mar 2008) | 3 lines

  #2503 make singletons compared with "is" not == or !=
  Thanks to Wummel for the patch
........
  r62044 | gerhard.haering | 2008-03-29 14:11:52 -0500 (Sat, 29 Mar 2008) | 2 lines

  Documented the lastrowid attribute.
........
  r62052 | benjamin.peterson | 2008-03-30 14:35:10 -0500 (Sun, 30 Mar 2008) | 2 lines

  Updated README regarding doc formats
........
  r62053 | georg.brandl | 2008-03-30 14:41:39 -0500 (Sun, 30 Mar 2008) | 2 lines

  The other download formats will be available for 2.6 too.
........
2008-03-31 01:51:45 +00:00
Jeffrey Yasskin 7315bad3c4 Blocked revisions 62067 via svnmerge
........
  r62067 | jeffrey.yasskin | 2008-03-30 17:35:53 -0700 (Sun, 30 Mar 2008) | 2 lines

  Block the sys.exc_clear -3 warning from threading.py.
........
2008-03-31 00:38:53 +00:00
Neal Norwitz 6d4881643e Blocked revisions 62023,62025,62028 via svnmerge
........
  r62023 | amaury.forgeotdarc | 2008-03-28 17:44:58 -0700 (Fri, 28 Mar 2008) | 5 lines

  Try to understand why most buildbots suddenly turned to red.
  Undo the only change that might have unexpected effects.

  To be followed.
........
  r62025 | amaury.forgeotdarc | 2008-03-28 17:49:07 -0700 (Fri, 28 Mar 2008) | 2 lines

  At least let the module compile
........
  r62028 | amaury.forgeotdarc | 2008-03-28 18:41:08 -0700 (Fri, 28 Mar 2008) | 2 lines

  Revert my experiment. I found one reason of failures in test_logging.
........
2008-03-30 22:49:52 +00:00
Martin v. Löwis 95099bad1b Blocked revisions 62019 via svnmerge
........
  r62019 | amaury.forgeotdarc | 2008-03-28 22:55:29 +0100 (Fr, 28 Mär 2008) | 7 lines

  Repair compilation for Visual Studio 2005.

  I applied the same changes manually to VS7.1 and VC6 files; completely untested.

  (Christian, don't try too hard merging this change into py3k.
  It will be easier to do the same work again on the branch)
........
2008-03-30 20:45:26 +00:00
Martin v. Löwis ede8ffba96 Merged revisions 62018 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62018 | benjamin.peterson | 2008-03-28 21:56:00 +0100 (Fr, 28 Mär 2008) | 2 lines

  #2498 modernized try, except, finally statments in bdb
........
2008-03-30 20:43:50 +00:00
Martin v. Löwis a3ab99dcd9 Blocked revisions 62015 via svnmerge
This was apparently fixed in r54428 already
........
  r62015 | amaury.forgeotdarc | 2008-03-28 21:30:50 +0100 (Fr, 28 Mär 2008) | 5 lines

  Fix a reference leak found by Georg, when compiling a class nested in another class.
  Now "regrtest.py -R:: test_compile" is satisfied.

  Will backport.
........
2008-03-30 20:38:01 +00:00
Martin v. Löwis 617fa91d89 Merged revisions 62013-62014 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62013 | amaury.forgeotdarc | 2008-03-28 21:17:51 +0100 (Fr, 28 Mär 2008) | 2 lines

  Silence a compilation warning
........
  r62014 | georg.brandl | 2008-03-28 21:22:56 +0100 (Fr, 28 Mär 2008) | 2 lines

  Silence compiler warning at the source.
........
2008-03-30 20:29:36 +00:00
Martin v. Löwis 633291014f Merged revisions 62012 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62012 | gregory.p.smith | 2008-03-28 21:11:49 +0100 (Fr, 28 Mär 2008) | 2 lines

  These svn adds were forgotten in r62000
........
test/dump.py was already added in r62022,
so it was not merged.
2008-03-30 20:23:50 +00:00
Martin v. Löwis 0311736fc1 Merged revisions 62011 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62011 | gerhard.haering | 2008-03-28 21:08:36 +0100 (Fr, 28 Mär 2008) | 2 lines

  Update sqlite3 module to match current version of pysqlite.
........
2008-03-30 20:21:00 +00:00
Martin v. Löwis 72c82a4d62 Merged revisions 62007 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62007 | georg.brandl | 2008-03-28 13:58:26 +0100 (Fr, 28 Mär 2008) | 2 lines

  #2502: add example how to do enum types with named tuples.
........
2008-03-30 20:18:05 +00:00
Martin v. Löwis 6ff4b3ca7b Block 62006, as that section was rewritten in 58038. 2008-03-30 20:16:56 +00:00
Martin v. Löwis 17db139531 Block 62005, as it applies only to the trunk. 2008-03-30 20:09:13 +00:00
Martin v. Löwis 618dc5e064 Merged revisions 62004 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines

  Patch #1810 by Thomas Lee, reviewed by myself:
  allow compiling Python AST objects into code objects
  in compile().
........
2008-03-30 20:03:44 +00:00
Gerhard Häring d3372793d6 Documented lastrowid attribute in py3k branch. 2008-03-29 19:13:55 +00:00
Gerhard Häring e871ad59cf Moved DECREF to correct place to get rid of leaked references. 2008-03-29 14:11:55 +00:00
Jeffrey Yasskin ca67412f28 Update test_threading with a couple changes from trunk that got lost due, I
presume, to merge conflicts.
2008-03-29 05:06:52 +00:00
Georg Brandl 34465e7ec6 Blocked revisions 62030 via svnmerge
........
  r62030 | georg.brandl | 2008-03-29 02:50:06 +0100 (Sat, 29 Mar 2008) | 2 lines

  Backport #1442: report exception when startup file cannot be run.
........
2008-03-29 02:04:05 +00:00
Georg Brandl ed51121497 Blocked revisions 62026 via svnmerge
........
  r62026 | gerhard.haering | 2008-03-29 02:27:37 +0100 (Sat, 29 Mar 2008) | 3 lines

  Brought documentation for sqlite3 module up-to-date. Fixed Issue1625205 which
  complained about commit, rollback and close not being documented.
........
2008-03-29 02:00:47 +00:00
Gerhard Häring 0d7d6cfee4 Same documentation for sqlite3 module as in 2.6. 2008-03-29 01:32:44 +00:00
Gerhard Häring e7ea7451a8 Bring sqlite3 module up-to-date with what's now in 2.6. Almost. I intentionally
left out the stuff about creating a connection object from a APSW connection.
2008-03-29 00:45:29 +00:00