1
=== modified file 'lib/lp/bugs/doc/externalbugtracker-bugzilla.txt'
2
--- lib/lp/bugs/doc/externalbugtracker-bugzilla.txt	2009-09-23 12:24:10 +0000
3
+++ lib/lp/bugs/doc/externalbugtracker-bugzilla.txt	2010-01-13 10:28:18 +0000
4
@@ -24,11 +24,11 @@
5
24
24
6
25
    >>> from canonical.testing import LaunchpadZopelessLayer
25
    >>> from canonical.testing import LaunchpadZopelessLayer
7
26
    >>> txn = LaunchpadZopelessLayer.txn
26
    >>> txn = LaunchpadZopelessLayer.txn
9
27
    >>> external_bugzilla = Bugzilla('http://example.com/', version='A.B4')
27
    >>> external_bugzilla = Bugzilla('http://example.com/', version='A.B')
10
28
    Traceback (most recent call last):
28
    Traceback (most recent call last):
11
29
      ...
29
      ...
12
30
    UnparseableBugTrackerVersion:
30
    UnparseableBugTrackerVersion:
14
31
    Failed to parse version 'A.B4' for http://...
31
    Failed to parse version 'A.B' for http://...
15
32
32
16
33
The version parsing is carried out by the Bugzilla._parseVersion()
33
The version parsing is carried out by the Bugzilla._parseVersion()
17
34
method, which takes a version string and returns a tuple of
34
method, which takes a version string and returns a tuple of
18
@@ -51,7 +51,7 @@
19
51
+ characters in the version string will be removed.
51
+ characters in the version string will be removed.
20
52
52
21
53
    >>> print external_bugzilla._parseVersion('3.2+1')
53
    >>> print external_bugzilla._parseVersion('3.2+1')
23
54
    (3, 21)
54
    (3, 2, 1)
24
55
55
25
56
Since we don't want to depend on a working network connection, we use a
56
Since we don't want to depend on a working network connection, we use a
26
57
slightly modified implementation.
57
slightly modified implementation.
27
@@ -201,6 +201,31 @@
28
201
    >>> isinstance(bugzilla_to_use, BugzillaLPPlugin)
201
    >>> isinstance(bugzilla_to_use, BugzillaLPPlugin)
29
202
    True
202
    True
30
203
203
31
204
Older versions of the Bugzilla API return tuples rather than mappings
32
205
in response to XML-RPC calls. When something other than a mapping is
33
206
returned, the standard non-API non-plugin external bug tracker is
34
207
selected.
35
208
36
209
    >>> class OldXMLRPCTransport(xmlrpclib.Transport):
37
210
    ...     def request(self, host, handler, request, verbose=None):
38
211
    ...         args, method_name = xmlrpclib.loads(request)
39
212
    ...
40
213
    ...         if method_name == 'Bugzilla.version':
41
214
    ...             return ('versionResponse', {'version': '3.2.5+'})
42
215
    ...         else:
43
216
    ...             raise xmlrpclib.Fault('Client', 'No such method')
44
217
    ...
45
218
    >>> test_transport = OldXMLRPCTransport()
46
219
47
220
    >>> bugzilla._test_xmlrpc_proxy = xmlrpclib.ServerProxy(
48
221
    ...     'http://example.com/xmlrpc.cgi',
49
222
    ...     transport=test_transport)
50
223
51
224
    >>> bugzilla_to_use = bugzilla.getExternalBugTrackerToUse()
52
225
    >>> (isinstance(bugzilla_to_use, BugzillaAPI) or
53
226
    ...  isinstance(bugzilla_to_use, BugzillaLPPlugin))
54
227
    False
55
228
56
204
229
57
205
== Status Conversion ==
230
== Status Conversion ==
58
206
231
59
207
232
60
=== modified file 'lib/lp/bugs/externalbugtracker/bugzilla.py'
61
--- lib/lp/bugs/externalbugtracker/bugzilla.py	2010-01-06 14:35:52 +0000
62
+++ lib/lp/bugs/externalbugtracker/bugzilla.py	2010-01-13 10:28:18 +0000
63
@@ -12,6 +12,7 @@
64
12
    ]
12
    ]
65
13
13
66
14
import pytz
14
import pytz
67
15
import re
68
15
import xml.parsers.expat
16
import xml.parsers.expat
69
16
import xmlrpclib
17
import xmlrpclib
70
17
18
71
@@ -69,7 +70,7 @@
72
69
        try:
70
        try:
73
70
            # We try calling Bugzilla.version() on the remote
71
            # We try calling Bugzilla.version() on the remote
74
71
            # server because it's the most lightweight method there is.
72
            # server because it's the most lightweight method there is.
76
72
            remote_version_dict = proxy.Bugzilla.version()
73
            remote_version = proxy.Bugzilla.version()
77
73
        except xmlrpclib.Fault, fault:
74
        except xmlrpclib.Fault, fault:
78
74
            if fault.faultCode == 'Client':
75
            if fault.faultCode == 'Client':
79
75
                return False
76
                return False
80
@@ -88,10 +89,12 @@
81
88
            # The server returned an unparsable response.
89
            # The server returned an unparsable response.
82
89
            return False
90
            return False
83
90
        else:
91
        else:
88
91
            if remote_version_dict['version'] >= '3.4':
92
            # Older versions of the Bugzilla API return tuples. We
89
92
                return True
93
            # consider anything other than a mapping to be unsupported.
90
93
            else:
94
            if isinstance(remote_version, dict):
91
94
                return False
95
                if remote_version['version'] >= '3.4':
92
96
                    return True
93
97
            return False
94
95
98
95
96
    def _remoteSystemHasPluginAPI(self):
99
    def _remoteSystemHasPluginAPI(self):
96
97
        """Return True if the remote host has the Launchpad plugin installed.
100
        """Return True if the remote host has the Launchpad plugin installed.
97
@@ -191,25 +194,13 @@
98
191
        if version is None:
194
        if version is None:
99
192
            return None
195
            return None
100
193
196
115
194
        try:
197
        version_numbers = re.findall('[0-9]+', version)
116
195
            # XXX 2008-09-15 gmb bug 270695:
198
        if len(version_numbers) == 0:
103
196
            #     We can clean this up by just stripping out anything
104
197
            #     not in [0-9\.].
105
198
            # Get rid of trailing -rh, -debian, etc.
106
199
            version = version.split("-")[0]
107
200
            # Ignore plusses in the version.
108
201
            version = version.replace("+", "")
109
202
            # Ignore the 'rc' string in release candidate versions.
110
203
            version = version.replace("rc", "")
111
204
            # We need to convert the version to a tuple of integers if
112
205
            # we are to compare it correctly.
113
206
            version = tuple(int(x) for x in version.split("."))
114
207
        except ValueError:
117
208
            raise UnparseableBugTrackerVersion(
199
            raise UnparseableBugTrackerVersion(
118
209
                'Failed to parse version %r for %s' %
200
                'Failed to parse version %r for %s' %
119
210
                (version, self.baseurl))
201
                (version, self.baseurl))
120
211
202
122
212
        return version
203
        return tuple(int(number) for number in version_numbers)
123
213
204
124
214
    def convertRemoteImportance(self, remote_importance):
205
    def convertRemoteImportance(self, remote_importance):
125
215
        """See `ExternalBugTracker`.
206
        """See `ExternalBugTracker`.
Reviewer	Review Type	Date Requested	Status
Brad Crittenden (community)	code	2010-01-11	Approve on 2010-01-12
Review via email: mp+17142@code.launchpad.net