[Python-Dev] descr-branch is dead; long live the trunk

[Tim Peters]

I completed merging descr-branch back into the trunk.  Checkins should no
longer occur on descr-branch.

The trunk was tagged before and after the merge:

before tag:  date2001-08-01
after  tag:  after-descr-branch-merge

After a few quiet months have passed, I intend to get rid of the assorted
dateYYYY-MM-DD tags added for repeated merging of the trunk back into the
branch.

One problem:  test_weakref.py fails now.  It didn't fail in the trunk before
the merge, or in descr-branch.  All the weakref files (_weakref.c,
weakref.py, test_weakref.py) are the same in both trunk and branch, so
there's no obvious accounting for this.  Most of test_weakref works fine:

C:\Code\python\dist\src\PCbuild>python ../lib/test/test_weakref.py
test_basic_callback (__main__.ReferencesTestCase) ... FAIL
test_basic_proxy (__main__.ReferencesTestCase) ... ok
test_basic_ref (__main__.ReferencesTestCase) ... ok
test_callable_proxy (__main__.ReferencesTestCase) ... ok
test_getweakrefcount (__main__.ReferencesTestCase) ... ok
test_getweakrefs (__main__.ReferencesTestCase) ... ok
test_multiple_callbacks (__main__.ReferencesTestCase) ... ok
Make sure all references are invalidated before callbacks ... ok
test_proxy_ref (__main__.ReferencesTestCase) ... ok
test_proxy_reuse (__main__.ReferencesTestCase) ... ok
test_ref_reuse (__main__.ReferencesTestCase) ... ok

======================================================================
FAIL: test_basic_callback (__main__.ReferencesTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "../lib/test/test_weakref.py", line 52, in test_basic_callback
    self.check_basic_callback(create_unbound_method)
  File "../lib/test/test_weakref.py", line 114, in check_basic_callback
    "callback did not properly set 'cbcalled'")
  File "C:\CODE\PYTHON\DIST\SRC\lib\unittest.py", line 249, in failUnless
    if not expr: raise self.failureException, msg
AssertionError: callback did not properly set 'cbcalled'
----------------------------------------------------------------------
Ran 11 tests in 0.000s

FAILED (failures=1)
Traceback (most recent call last):
  File "../lib/test/test_weakref.py", line 410, in ?
    run_unittest(ReferencesTestCase)
  File "../lib/test\test_support.py", line 146, in run_unittest
    raise TestFailed(str(err[1]))
test_support.TestFailed: callback did not properly set 'cbcalled'

C:\Code\python\dist\src\PCbuild>

Fred, would you take a look at that and see whether anything punches you in
the eye?  CVS made the merge back into the trunk much harder than it should
have been, and I don't to want hold things up for what's *probably* a
shallow problem I'm just too fried now to pick up on.

gamblingly y'rs  - tim