Merge lp:~stevenk/launchpad/bugzilla-greater-than-36 into lp:launchpad

[Steve Kowalik]

Use bugidtype=include in the form data if talking to a bugzilla instance with a version greater than or equal to 3.6.0, else continue using bug_id_type=include.

If we're chatting to a Bugzilla instance that is version 3.6.0 or higher, send "bugidtype=include", else send "bug_id_type=include". In my testing, this allows us to pull bugs from bugzilla.libav.org, and still able to pull from Abisource's bugzilla.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/bugs/externalbugtracker/bugzilla.py'
--- lib/lp/bugs/externalbugtracker/bugzilla.py	2012-07-02 15:40:45 +0000
+++ lib/lp/bugs/externalbugtracker/bugzilla.py	2012-11-19 04:56:20 +0000
@@ -381,16 +381,19 @@
             buglist_page = 'buglist.cgi'
             data = {
                 'form_name': 'buglist.cgi',
-                'bug_id_type': 'include',
                 'columnlist':
                     ('id,product,bug_status,resolution,'
                      'priority,bug_severity'),
                 'bug_id': ','.join(bug_ids),
                 }
             if self.version < (2, 17, 1):
-                data.update({'format': 'rdf'})
-            else:
-                data.update({'ctype': 'rdf'})
+                data['format'] = 'rdf'
+            else:
+                data['ctype'] = 'rdf'
+            if self.version >= (3, 6, 0):
+                data['bugidtype'] = 'include'
+            else:
+                data['bug_id_type'] = 'include'
             bug_tag = 'bz:bug'
             id_tag = 'bz:id'
             status_tag = 'bz:bug_status'