Re: Merge proposal: tseaver-better_unittests branch of zope.interface

On Mon, Mar 26, 2012 at 05:38:07PM -0400, Tres Seaver wrote:
> I've (finally!) finished my work to get zope.interface to 100% unit test
> coverage without relying on doctests:
> 
>   http://svn.zope.org/zope.interface/branches/tseaver-better_unittests/
> 
> The work is outlined in this document on the branch:
> 
> 
> http://svn.zope.org/zope.interface/branches/tseaver-better_unittests/README-better_unittest.txt?rev=124744&view=auto

I've a comment about this change, which was part of that large "merge
from launchpad" commit:

--- zope.interface/branches/tseaver-better_unittests/src/zope/interface/_zope_interface_coptimizations.c	(revision 118418)
+++ zope.interface/branches/tseaver-better_unittests/src/zope/interface/_zope_interface_coptimizations.c	(revision 124742)
@@ -980,5 +980,11 @@
     }
   else
-    Py_INCREF(result);
+    {
+      if (result == Py_None && default_ != NULL)
+        {
+          result = default_;
+        }
+      Py_INCREF(result);
+    }
 
   return result;

It seems to be a bugfix for http://pad.lv/910987 from [1]

[1] http://bazaar.launchpad.net/~tseaver/zope.interface/better_unittests/revision/182

I failed to find any mention of this CHANGES.txt on that branch.

Cheers!
Marius Gedminas
-- 
http://pov.lt/ -- Zope 3/BlueBream consulting and development

_______________________________________________
Zope-Dev maillist  -  [email protected]
https://mail.zope.org/mailman/listinfo/zope-dev
**  No cross posts or HTML encoding!  **
(Related lists -
 https://mail.zope.org/mailman/listinfo/zope-announce
 https://mail.zope.org/mailman/listinfo/zope )

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEARECAAYFAk9yQBoACgkQkVdEXeem14+J5wCfczeRppmhmiBWHbtydzrQG4s1
9cIAnjYNxjYz9PpeqmplZ3baerjyvVIu
=9tTI
-----END PGP SIGNATURE-----