Merge lp:~stevenk/launchpad/export-security_contact-for-1.0 into lp:launchpad

[Steve Kowalik]

Export security_contact (as None) on IProduct for 1.0 only.

During the death of IHasSecurityContact it was removed from every API version. This had the side effect of breaking users scripts. Resurrect security_contact for IProduct for 1.0 only. I did not want to resurrect IHasSecurityContact, so it's still dead on IDistribution.

[William Grant (wgrant)]

11 + description=_('Obsolete field for security contact')),

This is used in the webservice docs. Perhaps something like "Security contact (obsolete; always None)"?

24 @property
25 + def security_contact(self):
26 + return None

Isn't this just 'security_contact = None'?

51 + self.assertEqual(None, api_prod['security_contact'])

assertIs should be used with None, not assertEqual.

54 + self.assertFalse(api_prod.has_key('security_contact'))

has_key is pretty rare; we usually prefer to use "'key' in dict" instead. If you use that you can probably assertNotIn.

review: Approve (code)

=== modified file 'lib/lp/registry/interfaces/product.py'
--- lib/lp/registry/interfaces/product.py	2012-09-12 21:08:11 +0000
+++ lib/lp/registry/interfaces/product.py	2012-09-19 05:18:19 +0000
@@ -781,6 +781,12 @@
 
     packagings = Attribute(_("All the packagings for the project."))
 
+    security_contact = exported(
+        TextLine(
+            title=_('Security contact'), required=False, readonly=True,
+            description=_('Security contact (obsolete; always None)')),
+            ('devel', dict(exported=False)), as_of='1.0')
+
     def checkPrivateBugsTransitionAllowed(private_bugs, user):
         """Can the private_bugs attribute be changed to the value by the user?
 

=== modified file 'lib/lp/registry/model/product.py'
--- lib/lp/registry/model/product.py	2012-09-13 16:07:03 +0000
+++ lib/lp/registry/model/product.py	2012-09-19 05:18:19 +0000
@@ -408,6 +408,8 @@
         """
         pass
 
+    security_contact = None
+
     @property
     def pillar(self):
         """See `IBugTarget`."""

=== modified file 'lib/lp/registry/tests/test_product_webservice.py'
--- lib/lp/registry/tests/test_product_webservice.py	2012-08-29 03:19:38 +0000
+++ lib/lp/registry/tests/test_product_webservice.py	2012-09-19 05:18:19 +0000
@@ -103,3 +103,18 @@
                 body=('A current commercial subscription is required to use '
                       'proprietary bugs.')))
         self.assertIs(None, product.bug_sharing_policy)
+
+    def fetch_product(self, webservice, product, api_version):
+        return webservice.get(
+            canonical_url(product, force_local_path=True),
+            api_version=api_version).jsonBody()
+
+    def test_security_contact_exported(self):
+        # security_contact is exported for 1.0, but not for other versions.
+        product = self.factory.makeProduct()
+        webservice = webservice_for_person(product.owner)
+        api_prod = self.fetch_product(webservice, product, '1.0')
+        self.assertIs(None, api_prod['security_contact'])
+        for api_version in ('beta', 'devel'):
+            api_prod = self.fetch_product(webservice, product, api_version)
+            self.assertNotIn('security_contact', api_prod)