1
=== modified file 'buildout-templates/bin/kill-test-services.in'
2
--- buildout-templates/bin/kill-test-services.in	2010-04-20 19:10:35 +0000
3
+++ buildout-templates/bin/kill-test-services.in	2010-10-21 19:08:55 +0000
4
@@ -19,8 +19,7 @@
5
19
import sys
19
import sys
6
20
20
7
21
from canonical.testing.layers import MemcachedLayer
21
from canonical.testing.layers import MemcachedLayer
10
22
from canonical.librarian.ftests.harness import (
22
from canonical.librarian.testing.server import LibrarianTestSetup
9
23
    LibrarianTestSetup, TacLibrarianTestSetup)
11
24
from lp.services.osutils import kill_by_pidfile
23
from lp.services.osutils import kill_by_pidfile
12
25
24
13
26
25
14
@@ -32,7 +31,6 @@
15
32
    kill_by_pidfile(MemcachedLayer.getPidFile())
31
    kill_by_pidfile(MemcachedLayer.getPidFile())
16
33
    print "done."
32
    print "done."
17
34
    print "Killing Librarian....",
33
    print "Killing Librarian....",
18
35
    TacLibrarianTestSetup().tearDown()
19
36
    LibrarianTestSetup().tearDownRoot()
34
    LibrarianTestSetup().tearDownRoot()
20
37
    print "done."
35
    print "done."
21
38
    return 0
36
    return 0
22
39
37
23
=== modified file 'lib/canonical/database/ftests/test_multitablecopy.txt'
24
--- lib/canonical/database/ftests/test_multitablecopy.txt	2008-05-19 15:24:34 +0000
25
+++ lib/canonical/database/ftests/test_multitablecopy.txt	2010-10-21 19:08:55 +0000
26
@@ -5,8 +5,8 @@
27
5
5
28
6
    >>> import transaction
6
    >>> import transaction
29
7
    >>> from canonical.database import postgresql
7
    >>> from canonical.database import postgresql
30
8
    >>> from canonical.database.multitablecopy import MultiTableCopy
31
8
    >>> from canonical.database.sqlbase import cursor
9
    >>> from canonical.database.sqlbase import cursor
32
9
    >>> from canonical.database.multitablecopy import MultiTableCopy
33
10
10
34
11
    >>> # Keep track of tables we'll want to clean up later
11
    >>> # Keep track of tables we'll want to clean up later
35
12
    >>> tables_to_clean_up = []
12
    >>> tables_to_clean_up = []
36
13
13
37
=== modified file 'lib/canonical/launchpad/browser/ftests/logintoken-corner-cases.txt'
38
--- lib/canonical/launchpad/browser/ftests/logintoken-corner-cases.txt	2010-10-03 15:30:06 +0000
39
+++ lib/canonical/launchpad/browser/ftests/logintoken-corner-cases.txt	2010-10-21 19:08:55 +0000
40
@@ -11,11 +11,11 @@
41
11
redirect to the default token view. This would happen if for example the
11
redirect to the default token view. This would happen if for example the
42
12
user tried to re-post the form after validating one of their email addresses.
12
user tried to re-post the form after validating one of their email addresses.
43
13
13
44
14
    >>> from lp.registry.interfaces.person import IPersonSet
45
15
    >>> from canonical.launchpad.interfaces import (
46
16
    ...     ILoginTokenSet, LoginTokenType)
47
17
    >>> from canonical.launchpad.browser import ValidateEmailView
14
    >>> from canonical.launchpad.browser import ValidateEmailView
48
15
    >>> from canonical.launchpad.interfaces.authtoken import LoginTokenType
49
16
    >>> from canonical.launchpad.interfaces.logintoken import ILoginTokenSet
50
18
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
17
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
51
18
    >>> from lp.registry.interfaces.person import IPersonSet
52
19
19
53
20
    >>> foo_bar = getUtility(IPersonSet).getByName('name16')
20
    >>> foo_bar = getUtility(IPersonSet).getByName('name16')
54
21
    >>> token = getUtility(ILoginTokenSet).new(
21
    >>> token = getUtility(ILoginTokenSet).new(
55
22
22
56
=== modified file 'lib/canonical/launchpad/browser/oauth.py'
57
--- lib/canonical/launchpad/browser/oauth.py	2010-10-04 20:33:07 +0000
58
+++ lib/canonical/launchpad/browser/oauth.py	2010-10-21 19:08:55 +0000
59
@@ -9,12 +9,19 @@
60
9
    'OAuthTokenAuthorizedView',
9
    'OAuthTokenAuthorizedView',
61
10
    'lookup_oauth_context']
10
    'lookup_oauth_context']
62
11
11
63
12
from datetime import (
64
13
    datetime,
65
14
    timedelta,
66
15
    )
67
16
68
12
from lazr.restful import HTTPResource
17
from lazr.restful import HTTPResource
69
18
import pytz
70
13
import simplejson
19
import simplejson
71
14
from zope.component import getUtility
20
from zope.component import getUtility
72
15
from zope.formlib.form import (
21
from zope.formlib.form import (
73
16
    Action,
22
    Action,
74
17
    Actions,
23
    Actions,
75
24
    expandPrefix,
76
18
    )
25
    )
77
19
from zope.security.interfaces import Unauthorized
26
from zope.security.interfaces import Unauthorized
78
20
27
79
@@ -63,7 +70,7 @@
80
63
        return simplejson.dumps(structure)
70
        return simplejson.dumps(structure)
81
64
71
82
65
72
84
66
class OAuthRequestTokenView(LaunchpadView, JSONTokenMixin):
73
class OAuthRequestTokenView(LaunchpadFormView, JSONTokenMixin):
85
67
    """Where consumers can ask for a request token."""
74
    """Where consumers can ask for a request token."""
86
68
75
87
69
    def __call__(self):
76
    def __call__(self):
88
@@ -107,7 +114,21 @@
89
107
114
90
108
def token_review_success(form, action, data):
115
def token_review_success(form, action, data):
91
109
    """The success callback for a button to approve a token."""
116
    """The success callback for a button to approve a token."""
93
110
    form.reviewToken(action.permission)
117
    form.reviewToken(action.permission, action.duration)
94
118
95
119
96
120
class TemporaryIntegrations:
97
121
    """Contains duration constants for temporary integrations."""
98
122
99
123
    HOUR = "Hour"
100
124
    DAY = "Day"
101
125
    WEEK = "Week"
102
126
103
127
    DURATION = {
104
128
        HOUR : 60 * 60,
105
129
        DAY : 60 * 60 * 24,
106
130
        WEEK : 60 * 60 * 24 * 7
107
131
        }
108
111
132
109
112
133
110
113
def create_oauth_permission_actions():
134
def create_oauth_permission_actions():
111
@@ -115,19 +136,37 @@
112
115
136
113
116
    The first `Actions` object contains every action supported by the
137
    The first `Actions` object contains every action supported by the
114
117
    OAuthAuthorizeTokenView. The second list contains a good default
138
    OAuthAuthorizeTokenView. The second list contains a good default
116
118
    set of actions, omitting special permissions like DESKTOP_INTEGRATION.
139
    set of actions, omitting special actions like the
117
140
    DESKTOP_INTEGRATION ones.
118
119
    """
141
    """
119
120
    all_actions = Actions()
142
    all_actions = Actions()
120
121
    ordinary_actions = Actions()
143
    ordinary_actions = Actions()
121
144
    desktop_permission = OAuthPermission.DESKTOP_INTEGRATION
122
122
    for permission in OAuthPermission.items:
145
    for permission in OAuthPermission.items:
123
123
        action = Action(
146
        action = Action(
124
124
            permission.title, name=permission.name,
147
            permission.title, name=permission.name,
125
125
            success=token_review_success,
148
            success=token_review_success,
126
126
            condition=token_exists_and_is_not_reviewed)
149
            condition=token_exists_and_is_not_reviewed)
127
127
        action.permission = permission
150
        action.permission = permission
128
151
        action.duration = None
129
128
        all_actions.append(action)
152
        all_actions.append(action)
131
129
        if permission != OAuthPermission.DESKTOP_INTEGRATION:
153
        if permission != desktop_permission:
132
130
            ordinary_actions.append(action)
154
            ordinary_actions.append(action)
133
155
134
156
    # Add special actions for the time-limited DESKTOP_INTEGRATION
135
157
    # tokens.
136
158
    for duration in (
137
159
        TemporaryIntegrations.HOUR, TemporaryIntegrations.DAY,
138
160
        TemporaryIntegrations.WEEK):
139
161
        action = Action(
140
162
            ("For One %s" % duration),
141
163
            name=expandPrefix(desktop_permission.name) + duration,
142
164
            success=token_review_success,
143
165
            condition=token_exists_and_is_not_reviewed)
144
166
        action.permission = desktop_permission
145
167
        action.duration = duration
146
168
        all_actions.append(action)
147
169
148
131
    return all_actions, ordinary_actions
170
    return all_actions, ordinary_actions
149
132
171
150
133
172
151
@@ -161,7 +200,8 @@
152
161
        used by normal applications.
200
        used by normal applications.
153
162
        """
201
        """
154
163
202
156
164
        allowed_permissions = self.request.form_ng.getAll('allow_permission')
203
        allowed_permissions = set(
157
204
            self.request.form_ng.getAll('allow_permission'))
158
165
        if len(allowed_permissions) == 0:
205
        if len(allowed_permissions) == 0:
159
166
            return self.actions_excluding_special_permissions
206
            return self.actions_excluding_special_permissions
160
167
        actions = Actions()
207
        actions = Actions()
161
@@ -174,9 +214,10 @@
162
174
214
163
175
        # DESKTOP_INTEGRATION cannot be requested as one of several
215
        # DESKTOP_INTEGRATION cannot be requested as one of several
164
176
        # options--it must be the only option (other than
216
        # options--it must be the only option (other than
167
177
        # UNAUTHORIZED). If DESKTOP_INTEGRATION is one of several
217
        # UNAUTHORIZED). If there is any item in the list that doesn't
168
178
        # options, remove it from the list.
218
        # use DESKTOP_INTEGRATION, remove it from the list.
169
179
        desktop_permission = OAuthPermission.DESKTOP_INTEGRATION
219
        desktop_permission = OAuthPermission.DESKTOP_INTEGRATION
170
220
171
180
        if (desktop_permission.name in allowed_permissions
221
        if (desktop_permission.name in allowed_permissions
172
181
            and len(allowed_permissions) > 1):
222
            and len(allowed_permissions) > 1):
173
182
            allowed_permissions.remove(desktop_permission.name)
223
            allowed_permissions.remove(desktop_permission.name)
174
@@ -192,33 +233,40 @@
175
192
                     "the computer being integrated."
233
                     "the computer being integrated."
176
193
                     % self.token.consumer.key))
234
                     % self.token.consumer.key))
177
194
235
182
195
            # We're going for desktop integration. The only two
236
            # We're going for desktop integration. There are four
183
196
            # possibilities are "allow" and "deny". We'll customize
237
            # possibilities: "allow permanently", "allow for one
184
197
            # the "allow" message using the hostname provided by the
238
            # hour", "allow for one day", "allow for one week", and
185
198
            # desktop.
239
            # "deny". We'll customize the "allow permanently" and
186
240
            # "deny" message using the hostname provided by the
187
241
            # desktop. We'll use the existing Action objects for the
188
242
            # "temporary integration" actions, without customizing
189
243
            # their messages.
190
199
            #
244
            #
191
200
            # Since self.actions is a descriptor that returns copies
245
            # Since self.actions is a descriptor that returns copies
192
201
            # of Action objects, we can modify the actions we get
246
            # of Action objects, we can modify the actions we get
193
202
            # in-place without ruining the Action objects for everyone
247
            # in-place without ruining the Action objects for everyone
194
203
            # else.
248
            # else.
195
204
            desktop_name = self.token.consumer.integrated_desktop_name
249
            desktop_name = self.token.consumer.integrated_desktop_name
196
205
            label = (
197
206
                'Give all programs running on &quot;%s&quot; access '
198
207
                'to my Launchpad account.')
199
208
            allow_action = [
250
            allow_action = [
200
209
                action for action in self.actions
251
                action for action in self.actions
201
210
                if action.name == desktop_permission.name][0]
252
                if action.name == desktop_permission.name][0]
203
211
            allow_action.label = label % desktop_name
253
            allow_action.label = "Until I Disable It"
204
212
            actions.append(allow_action)
254
            actions.append(allow_action)
205
213
255
208
214
            # We'll customize the "deny" message as well.
256
            # Bring in all of the temporary integration actions.
209
215
            label = "No, thanks, I don't trust &quot;%s&quot;."
257
            for action in self.actions:
210
258
                if (action.permission == desktop_permission
211
259
                    and action.name != desktop_permission.name):
212
260
                    actions.append(action)
213
261
214
262
            # Fionally, customize the "deny" message.
215
263
            label = (
216
264
                "Do Not Allow &quot;%s&quot; to Access my Launchpad Account.")
217
216
            deny_action = [
265
            deny_action = [
218
217
                action for action in self.actions
266
                action for action in self.actions
219
218
                if action.name == OAuthPermission.UNAUTHORIZED.name][0]
267
                if action.name == OAuthPermission.UNAUTHORIZED.name][0]
220
219
            deny_action.label = label % desktop_name
268
            deny_action.label = label % desktop_name
221
220
            actions.append(deny_action)
269
            actions.append(deny_action)
222
221
223
222
        else:
270
        else:
224
223
            # We're going for web-based integration.
271
            # We're going for web-based integration.
225
224
            for action in self.actions_excluding_special_permissions:
272
            for action in self.actions_excluding_special_permissions:
226
@@ -237,6 +285,25 @@
227
237
            return self.actions_excluding_special_permissions
285
            return self.actions_excluding_special_permissions
228
238
        return actions
286
        return actions
229
239
287
230
288
    @property
231
289
    def visible_desktop_integration_actions(self):
232
290
        """Return all visible actions for DESKTOP_INTEGRATION."""
233
291
        actions = Actions()
234
292
        for action in self.visible_actions:
235
293
            if action.permission is OAuthPermission.DESKTOP_INTEGRATION:
236
294
                actions.append(action)
237
295
        return actions
238
296
239
297
    @property
240
298
    def unauthorized_action(self):
241
299
        """Returns just the action for the UNAUTHORIZED permission level."""
242
300
        for action in self.visible_actions:
243
301
            if action.permission is OAuthPermission.UNAUTHORIZED:
244
302
                return action
245
303
        raise AssertionError(
246
304
            "UNAUTHORIZED permission level should always be visible, "
247
305
            "but wasn't.")
248
306
249
240
    def initialize(self):
307
    def initialize(self):
250
241
        self.storeTokenContext()
308
        self.storeTokenContext()
251
242
        form = get_oauth_authorization(self.request)
309
        form = get_oauth_authorization(self.request)
252
@@ -244,7 +311,6 @@
253
244
        if key:
311
        if key:
254
245
            self.token = getUtility(IOAuthRequestTokenSet).getByKey(key)
312
            self.token = getUtility(IOAuthRequestTokenSet).getByKey(key)
255
246
313
256
247
257
248
        callback = self.request.form.get('oauth_callback')
314
        callback = self.request.form.get('oauth_callback')
258
249
        if (self.token is not None
315
        if (self.token is not None
259
250
            and self.token.consumer.is_integrated_desktop):
316
            and self.token.consumer.is_integrated_desktop):
260
@@ -295,8 +361,16 @@
261
295
            raise UnexpectedFormData("Unknown context.")
361
            raise UnexpectedFormData("Unknown context.")
262
296
        self.token_context = context
362
        self.token_context = context
263
297
363
266
298
    def reviewToken(self, permission):
364
    def reviewToken(self, permission, duration):
267
299
        self.token.review(self.user, permission, self.token_context)
365
        duration_seconds = TemporaryIntegrations.DURATION.get(duration)
268
366
        if duration_seconds is not None:
269
367
            duration_delta = timedelta(seconds=duration_seconds)
270
368
            expiration_date = (
271
369
                datetime.now(pytz.timezone('UTC')) + duration_delta)
272
370
        else:
273
371
            expiration_date = None
274
372
        self.token.review(self.user, permission, self.token_context,
275
373
                          date_expires=expiration_date)
276
300
        callback = self.request.form.get('oauth_callback')
374
        callback = self.request.form.get('oauth_callback')
277
301
        if callback:
375
        if callback:
278
302
            self.next_url = callback
376
            self.next_url = callback
279
@@ -304,6 +378,7 @@
280
304
            self.next_url = (
378
            self.next_url = (
281
305
                '+token-authorized?oauth_token=%s' % self.token.key)
379
                '+token-authorized?oauth_token=%s' % self.token.key)
282
306
380
283
381
284
307
def lookup_oauth_context(context):
382
def lookup_oauth_context(context):
285
308
    """Transform an OAuth context string into a context object.
383
    """Transform an OAuth context string into a context object.
286
309
384
287
310
385
288
=== modified file 'lib/canonical/launchpad/components/tests/decoratedresultset.txt'
289
--- lib/canonical/launchpad/components/tests/decoratedresultset.txt	2010-10-09 16:36:22 +0000
290
+++ lib/canonical/launchpad/components/tests/decoratedresultset.txt	2010-10-21 19:08:55 +0000
291
@@ -10,8 +10,8 @@
292
10
ResultSet:
10
ResultSet:
293
11
11
294
12
    >>> from zope.component import getUtility
12
    >>> from zope.component import getUtility
295
13
    >>> from lp.registry.interfaces.distribution import IDistributionSet
296
13
    >>> from storm.store import Store
14
    >>> from storm.store import Store
297
14
    >>> from lp.registry.interfaces.distribution import IDistributionSet
298
15
    >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
15
    >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
299
16
    >>> store = Store.of(ubuntu)
16
    >>> store = Store.of(ubuntu)
300
17
    >>> from lp.registry.model.distribution import Distribution
17
    >>> from lp.registry.model.distribution import Distribution
301
18
18
302
=== modified file 'lib/canonical/launchpad/doc/account.txt'
303
--- lib/canonical/launchpad/doc/account.txt	2010-10-10 15:39:28 +0000
304
+++ lib/canonical/launchpad/doc/account.txt	2010-10-21 19:08:55 +0000
305
@@ -126,8 +126,10 @@
306
126
If we add a new guessed email address, it will be included in the
126
If we add a new guessed email address, it will be included in the
307
127
guessed list.
127
guessed list.
308
128
128
311
129
    >>> from canonical.launchpad.interfaces import (
129
    >>> from canonical.launchpad.interfaces.emailaddress import (
312
130
    ...     EmailAddressStatus, IEmailAddressSet)
130
    ...     EmailAddressStatus,
313
131
    ...     IEmailAddressSet,
314
132
    ...     )
315
131
    >>> email = getUtility(IEmailAddressSet).new(
133
    >>> email = getUtility(IEmailAddressSet).new(
316
132
    ...     "guessed-email@example.com", account=account,
134
    ...     "guessed-email@example.com", account=account,
317
133
    ...     status=EmailAddressStatus.NEW)
135
    ...     status=EmailAddressStatus.NEW)
318
@@ -294,8 +296,8 @@
319
294
296
320
295
    # We need to change database policy here again, as the SSO Server cannot
297
    # We need to change database policy here again, as the SSO Server cannot
321
296
    # modify tables in the lpmain replication set.
298
    # modify tables in the lpmain replication set.
322
299
    >>> from canonical.launchpad.webapp.dbpolicy import MasterDatabasePolicy
323
297
    >>> from canonical.launchpad.webapp.interfaces import IStoreSelector
300
    >>> from canonical.launchpad.webapp.interfaces import IStoreSelector
324
298
    >>> from canonical.launchpad.webapp.dbpolicy import MasterDatabasePolicy
325
299
    >>> getUtility(IStoreSelector).push(MasterDatabasePolicy())
301
    >>> getUtility(IStoreSelector).push(MasterDatabasePolicy())
326
300
302
327
301
    >>> from lp.registry.interfaces.person import PersonCreationRationale
303
    >>> from lp.registry.interfaces.person import PersonCreationRationale
328
302
304
329
=== modified file 'lib/canonical/launchpad/doc/announcement-date-widget.txt'
330
--- lib/canonical/launchpad/doc/announcement-date-widget.txt	2009-08-13 19:36:01 +0000
331
+++ lib/canonical/launchpad/doc/announcement-date-widget.txt	2010-10-21 19:08:55 +0000
332
@@ -4,10 +4,10 @@
333
4
choose to publish an announcement immediately, at a predetermined date in the
4
choose to publish an announcement immediately, at a predetermined date in the
334
5
future, or to manually publish it later.
5
future, or to manually publish it later.
335
6
6
336
7
    >>> from zope.schema import Field
337
7
    >>> from canonical.launchpad.testing.pages import extract_text
8
    >>> from canonical.launchpad.testing.pages import extract_text
338
8
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
9
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
339
9
    >>> from canonical.widgets.announcementdate import AnnouncementDateWidget
10
    >>> from canonical.widgets.announcementdate import AnnouncementDateWidget
340
10
    >>> from zope.schema import Field
341
11
    >>> field = Field(__name__='foo', title=u'Foo')
11
    >>> field = Field(__name__='foo', title=u'Foo')
342
12
    >>> widget = AnnouncementDateWidget(field, LaunchpadTestRequest())
12
    >>> widget = AnnouncementDateWidget(field, LaunchpadTestRequest())
343
13
    >>> print extract_text(widget())
13
    >>> print extract_text(widget())
344
14
14
345
=== modified file 'lib/canonical/launchpad/doc/batch_navigation.txt'
346
--- lib/canonical/launchpad/doc/batch_navigation.txt	2010-10-09 16:36:22 +0000
347
+++ lib/canonical/launchpad/doc/batch_navigation.txt	2010-10-21 19:08:55 +0000
348
@@ -55,8 +55,8 @@
349
55
55
350
56
Imports and initialization:
56
Imports and initialization:
351
57
57
352
58
  >>> from canonical.ftests.pgsql import CursorWrapper
353
58
  >>> from canonical.launchpad.database import EmailAddress
59
  >>> from canonical.launchpad.database import EmailAddress
354
59
  >>> from canonical.ftests.pgsql import CursorWrapper
355
60
  >>> from canonical.launchpad.interfaces.lpstorm import IStore
60
  >>> from canonical.launchpad.interfaces.lpstorm import IStore
356
61
  >>> ignore = IStore(EmailAddress) # Prime the database connection.
61
  >>> ignore = IStore(EmailAddress) # Prime the database connection.
357
62
  ... # (Priming is important if this test is run in isolation).
62
  ... # (Priming is important if this test is run in isolation).
358
63
63
359
=== modified file 'lib/canonical/launchpad/doc/canonical_url.txt'
360
--- lib/canonical/launchpad/doc/canonical_url.txt	2010-10-09 16:36:22 +0000
361
+++ lib/canonical/launchpad/doc/canonical_url.txt	2010-10-21 19:08:55 +0000
362
@@ -502,8 +502,8 @@
363
502
502
364
503
    >>> from zope.app.security.principalregistry import (
503
    >>> from zope.app.security.principalregistry import (
365
504
    ...     UnauthenticatedPrincipal)
504
    ...     UnauthenticatedPrincipal)
366
505
    >>> from canonical.launchpad.webapp.interaction import setupInteraction
367
505
    >>> from canonical.launchpad.webapp.servers import WebServiceTestRequest
506
    >>> from canonical.launchpad.webapp.servers import WebServiceTestRequest
368
506
    >>> from canonical.launchpad.webapp.interaction import setupInteraction
369
507
    >>> from lazr.restful.utils import get_current_browser_request
507
    >>> from lazr.restful.utils import get_current_browser_request
370
508
    >>> anonymous = UnauthenticatedPrincipal(None, None, None)
508
    >>> anonymous = UnauthenticatedPrincipal(None, None, None)
371
509
    >>> api_request = WebServiceTestRequest()
509
    >>> api_request = WebServiceTestRequest()
372
510
510
373
=== modified file 'lib/canonical/launchpad/doc/canonical_url_examples.txt'
374
--- lib/canonical/launchpad/doc/canonical_url_examples.txt	2010-10-11 16:17:45 +0000
375
+++ lib/canonical/launchpad/doc/canonical_url_examples.txt	2010-10-21 19:08:55 +0000
376
@@ -52,8 +52,11 @@
377
52
52
378
53
== Persons and Teams ==
53
== Persons and Teams ==
379
54
54
382
55
    >>> from canonical.launchpad.interfaces import (
55
    >>> from lp.registry.interfaces.codeofconduct import (
383
56
    ...     IPersonSet, ICodeOfConductSet, ISignedCodeOfConductSet)
56
    ...     ICodeOfConductSet,
384
57
    ...     ISignedCodeOfConductSet,
385
58
    ...     )
386
59
    >>> from lp.registry.interfaces.person import IPersonSet
387
57
60
388
58
The IPersonSet.
61
The IPersonSet.
389
59
62
390
@@ -133,8 +136,8 @@
391
133
136
392
134
== Projects groups and products ==
137
== Projects groups and products ==
393
135
138
396
136
    >>> from canonical.launchpad.interfaces import (
139
    >>> from lp.registry.interfaces.product import IProductSet
397
137
    ...     IProjectGroupSet, IProductSet)
140
    >>> from lp.registry.interfaces.projectgroup import IProjectGroupSet
398
138
141
399
139
The IProjectGroupSet.
142
The IProjectGroupSet.
400
140
143
401
@@ -289,8 +292,8 @@
402
289
292
403
290
== Remote Bug Trackers and Remote Bugs ==
293
== Remote Bug Trackers and Remote Bugs ==
404
291
294
405
295
    >>> from lp.bugs.browser.bugtracker import RemoteBug
406
292
    >>> from lp.bugs.interfaces.bugtracker import IBugTrackerSet
296
    >>> from lp.bugs.interfaces.bugtracker import IBugTrackerSet
407
293
    >>> from lp.bugs.browser.bugtracker import RemoteBug
408
294
297
409
295
An IBugTrackerSet.
298
An IBugTrackerSet.
410
296
299
411
297
300
412
=== modified file 'lib/canonical/launchpad/doc/checkbox-matrix-widget.txt'
413
--- lib/canonical/launchpad/doc/checkbox-matrix-widget.txt	2010-10-03 15:30:06 +0000
414
+++ lib/canonical/launchpad/doc/checkbox-matrix-widget.txt	2010-10-21 19:08:55 +0000
415
@@ -10,8 +10,11 @@
416
10
10
417
11
    >>> from BeautifulSoup import BeautifulSoup
11
    >>> from BeautifulSoup import BeautifulSoup
418
12
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
12
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
421
13
    >>> from canonical.launchpad.interfaces import (
13
    >>> from lp.registry.interfaces.product import (
422
14
    ...     IProduct, IProductSet, License)
14
    ...     IProduct,
423
15
    ...     IProductSet,
424
16
    ...     License,
425
17
    ...     )
426
15
    >>> product = getUtility(IProductSet).get(1)
18
    >>> product = getUtility(IProductSet).get(1)
427
16
    >>> licenses_field = IProduct['licenses'].bind(product)
19
    >>> licenses_field = IProduct['licenses'].bind(product)
428
17
    >>> vtype = licenses_field.value_type
20
    >>> vtype = licenses_field.value_type
429
18
21
430
=== modified file 'lib/canonical/launchpad/doc/emailauthentication.txt'
431
--- lib/canonical/launchpad/doc/emailauthentication.txt	2010-10-15 15:20:39 +0000
432
+++ lib/canonical/launchpad/doc/emailauthentication.txt	2010-10-21 19:08:55 +0000
433
@@ -37,9 +37,9 @@
434
37
user in the launch bag:
37
user in the launch bag:
435
38
38
436
39
    >>> import email
39
    >>> import email
437
40
    >>> from zope.component import getUtility
438
40
    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
41
    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
439
41
    >>> from lp.registry.interfaces.person import IPersonSet
42
    >>> from lp.registry.interfaces.person import IPersonSet
440
42
    >>> from zope.component import getUtility
441
43
    >>> launchbag = getUtility(ILaunchBag)
43
    >>> launchbag = getUtility(ILaunchBag)
442
44
    >>> name, addr = email.Utils.parseaddr(msg['From'])
44
    >>> name, addr = email.Utils.parseaddr(msg['From'])
443
45
    >>> from_user = getUtility(IPersonSet).getByEmail(addr)
45
    >>> from_user = getUtility(IPersonSet).getByEmail(addr)
444
46
46
445
=== modified file 'lib/canonical/launchpad/doc/feeds.txt'
446
--- lib/canonical/launchpad/doc/feeds.txt	2009-08-05 18:52:52 +0000
447
+++ lib/canonical/launchpad/doc/feeds.txt	2010-10-21 19:08:55 +0000
448
@@ -108,8 +108,8 @@
449
108
by browsers and the reverse-proxy in front of the feeds servers.
108
by browsers and the reverse-proxy in front of the feeds servers.
450
109
109
451
110
    >>> from canonical.config import config
110
    >>> from canonical.config import config
452
111
    >>> from canonical.lazr.feed.feed import FeedBase
453
111
    >>> from lp.bugs.feed.bug import BugsFeedBase
112
    >>> from lp.bugs.feed.bug import BugsFeedBase
454
112
    >>> from canonical.lazr.feed.feed import FeedBase
455
113
    >>> config.launchpad.max_feed_cache_minutes
113
    >>> config.launchpad.max_feed_cache_minutes
456
114
    60
114
    60
457
115
    >>> config.launchpad.max_bug_feed_cache_minutes
115
    >>> config.launchpad.max_bug_feed_cache_minutes
458
116
116
459
=== modified file 'lib/canonical/launchpad/doc/gpg-encryption.txt'
460
--- lib/canonical/launchpad/doc/gpg-encryption.txt	2010-10-09 16:36:22 +0000
461
+++ lib/canonical/launchpad/doc/gpg-encryption.txt	2010-10-21 19:08:55 +0000
462
@@ -15,8 +15,8 @@
463
15
15
464
16
Sample Person has public and secret keys set.
16
Sample Person has public and secret keys set.
465
17
17
466
18
    >>> from zope.component import getUtility
467
18
    >>> from canonical.launchpad.ftests import login
19
    >>> from canonical.launchpad.ftests import login
468
19
    >>> from zope.component import getUtility
469
20
    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
20
    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
470
21
21
471
22
    >>> bag = getUtility(ILaunchBag)
22
    >>> bag = getUtility(ILaunchBag)
472
23
23
473
=== modified file 'lib/canonical/launchpad/doc/gpghandler.txt'
474
--- lib/canonical/launchpad/doc/gpghandler.txt	2010-10-03 15:30:06 +0000
475
+++ lib/canonical/launchpad/doc/gpghandler.txt	2010-10-21 19:08:55 +0000
476
@@ -25,8 +25,10 @@
477
25
    >>> from zope.component import getUtility
25
    >>> from zope.component import getUtility
478
26
    >>> from canonical.launchpad.webapp.testing import verifyObject
26
    >>> from canonical.launchpad.webapp.testing import verifyObject
479
27
27
482
28
    >>> from canonical.launchpad.interfaces import (
28
    >>> from canonical.launchpad.interfaces.gpghandler import (
483
29
    ...      IGPGHandler, IPymeKey)
29
    ...     IGPGHandler,
484
30
    ...     IPymeKey,
485
31
    ...     )
486
30
    >>> gpghandler = getUtility(IGPGHandler)
32
    >>> gpghandler = getUtility(IGPGHandler)
487
31
33
488
32
-------------------------------------------------------------------------
34
-------------------------------------------------------------------------
489
33
35
490
=== modified file 'lib/canonical/launchpad/doc/hasowner-authorization.txt'
491
--- lib/canonical/launchpad/doc/hasowner-authorization.txt	2010-01-12 14:52:41 +0000
492
+++ lib/canonical/launchpad/doc/hasowner-authorization.txt	2010-10-21 19:08:55 +0000
493
@@ -5,8 +5,8 @@
494
5
5
495
6
    # First we define a class which only provides IHasOwner.
6
    # First we define a class which only provides IHasOwner.
496
7
    >>> from zope.interface import implements
7
    >>> from zope.interface import implements
497
8
    >>> from lp.registry.interfaces.person import IPersonSet
498
8
    >>> from lp.registry.interfaces.role import IHasOwner
9
    >>> from lp.registry.interfaces.role import IHasOwner
499
9
    >>> from lp.registry.interfaces.person import IPersonSet
500
10
    >>> salgado = getUtility(IPersonSet).getByName('salgado')
10
    >>> salgado = getUtility(IPersonSet).getByName('salgado')
501
11
    >>> class FooObject:
11
    >>> class FooObject:
502
12
    ...     implements(IHasOwner)
12
    ...     implements(IHasOwner)
503
@@ -15,8 +15,8 @@
504
15
Salgado is the owner of any FooObject we create, so he can edit it.
15
Salgado is the owner of any FooObject we create, so he can edit it.
505
16
16
506
17
    >>> foo = FooObject()
17
    >>> foo = FooObject()
507
18
    >>> from zope.component import queryAdapter
508
18
    >>> from canonical.launchpad.webapp.interfaces import IAuthorization
19
    >>> from canonical.launchpad.webapp.interfaces import IAuthorization
509
19
    >>> from zope.component import queryAdapter
510
20
    >>> authorization = queryAdapter(foo, IAuthorization, 'launchpad.Edit')
20
    >>> authorization = queryAdapter(foo, IAuthorization, 'launchpad.Edit')
511
21
    >>> print authorization.checkAccountAuthenticated(salgado.account)
21
    >>> print authorization.checkAccountAuthenticated(salgado.account)
512
22
    True
22
    True
513
23
23
514
=== modified file 'lib/canonical/launchpad/doc/hierarchical-menu.txt'
515
--- lib/canonical/launchpad/doc/hierarchical-menu.txt	2010-07-27 12:42:00 +0000
516
+++ lib/canonical/launchpad/doc/hierarchical-menu.txt	2010-10-21 19:08:55 +0000
517
@@ -22,8 +22,8 @@
518
22
    >>> class ICooker(Interface):
22
    >>> class ICooker(Interface):
519
23
    ...     """A cooker."""
23
    ...     """A cooker."""
520
24
24
521
25
    >>> from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
522
25
    >>> from canonical.launchpad.webapp.url import urlappend
26
    >>> from canonical.launchpad.webapp.url import urlappend
523
26
    >>> from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
524
27
27
525
28
    >>> class BaseContent:
28
    >>> class BaseContent:
526
29
    ...     implements(ICanonicalUrlData)
29
    ...     implements(ICanonicalUrlData)
527
@@ -83,8 +83,8 @@
528
83
IBreadcrumb adapters are registered for them.  The hierarchy builds a list of
83
IBreadcrumb adapters are registered for them.  The hierarchy builds a list of
529
84
breadcrumbs starting with the breadcrumb closest to the hierarchy root.
84
breadcrumbs starting with the breadcrumb closest to the hierarchy root.
530
85
85
531
86
    >>> from canonical.launchpad.browser.launchpad import Hierarchy
532
86
    >>> from canonical.launchpad.webapp.breadcrumb import Breadcrumb
87
    >>> from canonical.launchpad.webapp.breadcrumb import Breadcrumb
533
87
    >>> from canonical.launchpad.browser.launchpad import Hierarchy
534
88
88
535
89
    # Monkey patch Hierarchy.makeBreadcrumbForRequestedPage so that we don't
89
    # Monkey patch Hierarchy.makeBreadcrumbForRequestedPage so that we don't
536
90
    # have to create fake views and other stuff to test breadcrumbs here. The
90
    # have to create fake views and other stuff to test breadcrumbs here. The
537
@@ -174,8 +174,8 @@
538
174
context.  The default adapter provides the url attribute, but the breadcrumb's
174
context.  The default adapter provides the url attribute, but the breadcrumb's
539
175
text must be overriden in subclasses.
175
text must be overriden in subclasses.
540
176
176
541
177
    >>> from canonical.launchpad.webapp.interfaces import IBreadcrumb
542
178
    >>> from zope.interface.verify import verifyObject
177
    >>> from zope.interface.verify import verifyObject
543
178
    >>> from canonical.launchpad.webapp.interfaces import IBreadcrumb
544
179
    >>> breadcrumb = Breadcrumb(cookbook)
179
    >>> breadcrumb = Breadcrumb(cookbook)
545
180
    >>> verifyObject(IBreadcrumb, breadcrumb)
180
    >>> verifyObject(IBreadcrumb, breadcrumb)
546
181
    True
181
    True
547
182
182
548
=== modified file 'lib/canonical/launchpad/doc/launchpad-container.txt'
549
--- lib/canonical/launchpad/doc/launchpad-container.txt	2009-06-12 16:36:02 +0000
550
+++ lib/canonical/launchpad/doc/launchpad-container.txt	2010-10-21 19:08:55 +0000
551
@@ -7,8 +7,8 @@
552
7
that we have an easy way of finding whether or not any given object is
7
that we have an easy way of finding whether or not any given object is
553
8
within the scope of a token's context and grant or deny access to it.
8
within the scope of a token's context and grant or deny access to it.
554
9
9
555
10
    >>> from canonical.launchpad.webapp.interfaces import ILaunchpadContainer
556
10
    >>> from canonical.launchpad.webapp.testing import verifyObject
11
    >>> from canonical.launchpad.webapp.testing import verifyObject
557
11
    >>> from canonical.launchpad.webapp.interfaces import ILaunchpadContainer
558
12
    >>> from lp.registry.interfaces.product import IProductSet
12
    >>> from lp.registry.interfaces.product import IProductSet
559
13
    >>> from lp.registry.interfaces.distribution import (
13
    >>> from lp.registry.interfaces.distribution import (
560
14
    ...     IDistributionSet)
14
    ...     IDistributionSet)
561
@@ -80,8 +80,8 @@
562
80
Bugs are associated to our pillars through their bug tasks, so a bug is
80
Bugs are associated to our pillars through their bug tasks, so a bug is
563
81
said to be within any of its bugtasks' targets.
81
said to be within any of its bugtasks' targets.
564
82
82
565
83
    >>> from lp.bugs.interfaces.bug import IBugSet
566
83
    >>> from operator import attrgetter
84
    >>> from operator import attrgetter
567
84
    >>> from lp.bugs.interfaces.bug import IBugSet
568
85
    >>> bug_1 = getUtility(IBugSet).get(1)
85
    >>> bug_1 = getUtility(IBugSet).get(1)
569
86
    >>> bugtasks = bug_1.bugtasks
86
    >>> bugtasks = bug_1.bugtasks
570
87
    >>> targets = [task.target for task in bug_1.bugtasks]
87
    >>> targets = [task.target for task in bug_1.bugtasks]
571
88
88
572
=== modified file 'lib/canonical/launchpad/doc/launchpad-target-widget.txt'
573
--- lib/canonical/launchpad/doc/launchpad-target-widget.txt	2010-10-09 16:36:22 +0000
574
+++ lib/canonical/launchpad/doc/launchpad-target-widget.txt	2010-10-21 19:08:55 +0000
575
@@ -3,10 +3,10 @@
576
3
The general +filebug allows bugs to be filed on any product or package,
3
The general +filebug allows bugs to be filed on any product or package,
577
4
and to help with this, the LaunchpadTargetWidget is used.
4
and to help with this, the LaunchpadTargetWidget is used.
578
5
5
579
6
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
580
6
    >>> from canonical.launchpad.webapp.testing import verifyObject
7
    >>> from canonical.launchpad.webapp.testing import verifyObject
581
8
    >>> from canonical.widgets.launchpadtarget import LaunchpadTargetWidget
582
7
    >>> from lp.bugs.interfaces.bug import IFrontPageBugAddForm
9
    >>> from lp.bugs.interfaces.bug import IFrontPageBugAddForm
583
8
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
584
9
    >>> from canonical.widgets.launchpadtarget import LaunchpadTargetWidget
585
10
10
586
11
    >>> empty_request = LaunchpadTestRequest()
11
    >>> empty_request = LaunchpadTestRequest()
587
12
    >>> widget = LaunchpadTargetWidget(
12
    >>> widget = LaunchpadTargetWidget(
588
@@ -14,8 +14,8 @@
589
14
14
590
15
The widget complies to both IInputWidget and IBrowserWidget.
15
The widget complies to both IInputWidget and IBrowserWidget.
591
16
16
592
17
    >>> from zope.app.form.browser.interfaces import IBrowserWidget
593
17
    >>> from zope.app.form.interfaces import IInputWidget
18
    >>> from zope.app.form.interfaces import IInputWidget
594
18
    >>> from zope.app.form.browser.interfaces import IBrowserWidget
595
19
    >>> verifyObject(IInputWidget, widget)
19
    >>> verifyObject(IInputWidget, widget)
596
20
    True
20
    True
597
21
    >>> verifyObject(IBrowserWidget, widget)
21
    >>> verifyObject(IBrowserWidget, widget)
598
22
22
599
=== modified file 'lib/canonical/launchpad/doc/launchpadform.txt'
600
--- lib/canonical/launchpad/doc/launchpadform.txt	2009-06-12 16:36:02 +0000
601
+++ lib/canonical/launchpad/doc/launchpadform.txt	2010-10-21 19:08:55 +0000
602
@@ -131,8 +131,8 @@
603
131
attribute:
131
attribute:
604
132
132
605
133
  >>> from zope.app.form.browser import TextWidget
133
  >>> from zope.app.form.browser import TextWidget
606
134
  >>> from canonical.launchpad.webapp import custom_widget
607
134
  >>> from canonical.widgets import PasswordChangeWidget
135
  >>> from canonical.widgets import PasswordChangeWidget
608
135
  >>> from canonical.launchpad.webapp import custom_widget
609
136
136
610
137
  >>> class FormTestView3(LaunchpadFormView):
137
  >>> class FormTestView3(LaunchpadFormView):
611
138
  ...     schema = IFormTest
138
  ...     schema = IFormTest
612
@@ -469,9 +469,9 @@
613
469
First we'll create a fake pagetemplate which doesn't use Launchpad's main
469
First we'll create a fake pagetemplate which doesn't use Launchpad's main
614
470
template and thus is way simpler.
470
template and thus is way simpler.
615
471
471
616
472
  >>> from z3c.ptcompat import ViewPageTemplateFile
617
473
  >>> from StringIO import StringIO
472
  >>> from StringIO import StringIO
618
474
  >>> from tempfile import mkstemp
473
  >>> from tempfile import mkstemp
619
474
  >>> from z3c.ptcompat import ViewPageTemplateFile
620
475
  >>> file, filename = mkstemp()
475
  >>> file, filename = mkstemp()
621
476
  >>> f = open(filename, 'w')
476
  >>> f = open(filename, 'w')
622
477
  >>> f.write(u'<div metal:use-macro="context/@@launchpad_form/form" />')
477
  >>> f.write(u'<div metal:use-macro="context/@@launchpad_form/form" />')
623
478
478
624
=== modified file 'lib/canonical/launchpad/doc/lazr-js-widgets.txt'
625
--- lib/canonical/launchpad/doc/lazr-js-widgets.txt	2010-10-09 16:36:22 +0000
626
+++ lib/canonical/launchpad/doc/lazr-js-widgets.txt	2010-10-21 19:08:55 +0000
627
@@ -82,8 +82,8 @@
628
82
The InlineEditPickerWidget can be used for any interface attribute that
82
The InlineEditPickerWidget can be used for any interface attribute that
629
83
has a vocabulary defined for it.
83
has a vocabulary defined for it.
630
84
84
631
85
    >>> from zope.component import getUtility
632
85
    >>> from canonical.widgets.lazrjs import InlineEditPickerWidget
86
    >>> from canonical.widgets.lazrjs import InlineEditPickerWidget
633
86
    >>> from zope.component import getUtility
634
87
    >>> from lp.bugs.interfaces.bugtask import IBugTask, IBugTaskSet
87
    >>> from lp.bugs.interfaces.bugtask import IBugTask, IBugTaskSet
635
88
    >>> bugtask = getUtility(IBugTaskSet).get(2)
88
    >>> bugtask = getUtility(IBugTaskSet).get(2)
636
89
    >>> def create_inline_edit_picker_widget():
89
    >>> def create_inline_edit_picker_widget():
637
90
90
638
=== modified file 'lib/canonical/launchpad/doc/librarian.txt'
639
--- lib/canonical/launchpad/doc/librarian.txt	2010-10-10 15:39:28 +0000
640
+++ lib/canonical/launchpad/doc/librarian.txt	2010-10-21 19:08:55 +0000
641
@@ -28,8 +28,8 @@
642
28
28
643
29
== High Level ==
29
== High Level ==
644
30
30
645
31
    >>> from StringIO import StringIO
646
31
    >>> from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
32
    >>> from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
647
32
    >>> from StringIO import StringIO
648
33
    >>> data = 'This is some data'
33
    >>> data = 'This is some data'
649
34
34
650
35
We can create LibraryFileAliases using the ILibraryFileAliasSet utility.
35
We can create LibraryFileAliases using the ILibraryFileAliasSet utility.
651
@@ -118,8 +118,8 @@
652
118
However, we can force the use of HTTP by setting the 'HTTP_X_SCHEME'
118
However, we can force the use of HTTP by setting the 'HTTP_X_SCHEME'
653
119
header in the request to 'http', even when 'use_https' is True.
119
header in the request to 'http', even when 'use_https' is True.
654
120
120
655
121
    >>> from zope.component import getMultiAdapter
656
121
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
122
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
657
122
    >>> from zope.component import getMultiAdapter
658
123
    >>> from urlparse import urlparse
123
    >>> from urlparse import urlparse
659
124
    >>> request = LaunchpadTestRequest(
124
    >>> request = LaunchpadTestRequest(
660
125
    ...     environ={'REQUEST_METHOD': 'GET',
125
    ...     environ={'REQUEST_METHOD': 'GET',
661
@@ -573,9 +573,9 @@
662
573
573
663
574
XXX bug=631884 we have to establish the flags object manually for testing.
574
XXX bug=631884 we have to establish the flags object manually for testing.
664
575
575
665
576
    >>> from lp.services.features import per_thread
666
577
    >>> from lp.services.features.flags import FeatureController
667
576
    >>> from lp.services.features.webapp import ScopesFromRequest
578
    >>> from lp.services.features.webapp import ScopesFromRequest
668
577
    >>> from lp.services.features.flags import FeatureController
669
578
    >>> from lp.services.features import per_thread
670
579
    >>> per_thread.features = FeatureController(
579
    >>> per_thread.features = FeatureController(
671
580
    ...     ScopesFromRequest(empty_request).lookup)
580
    ...     ScopesFromRequest(empty_request).lookup)
672
581
581
673
582
582
674
=== modified file 'lib/canonical/launchpad/doc/location-widget.txt'
675
--- lib/canonical/launchpad/doc/location-widget.txt	2010-09-21 04:21:16 +0000
676
+++ lib/canonical/launchpad/doc/location-widget.txt	2010-10-21 19:08:55 +0000
677
@@ -3,9 +3,9 @@
678
3
A widget used when setting the geographic location of a given person.
3
A widget used when setting the geographic location of a given person.
679
4
4
680
5
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
5
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
681
6
    >>> from canonical.widgets.location import LocationWidget
682
6
    >>> from lp.registry.interfaces.person import IPersonSet
7
    >>> from lp.registry.interfaces.person import IPersonSet
683
7
    >>> from lp.services.fields import LocationField
8
    >>> from lp.services.fields import LocationField
684
8
    >>> from canonical.widgets.location import LocationWidget
685
9
    >>> salgado = getUtility(IPersonSet).getByName('salgado')
9
    >>> salgado = getUtility(IPersonSet).getByName('salgado')
686
10
    >>> field = LocationField(__name__='location', title=u'Location')
10
    >>> field = LocationField(__name__='location', title=u'Location')
687
11
11
688
12
12
689
=== modified file 'lib/canonical/launchpad/doc/logintoken-pages.txt'
690
--- lib/canonical/launchpad/doc/logintoken-pages.txt	2010-10-03 15:30:06 +0000
691
+++ lib/canonical/launchpad/doc/logintoken-pages.txt	2010-10-21 19:08:55 +0000
692
@@ -21,8 +21,8 @@
693
21
    >>> from canonical.launchpad.interfaces.authtoken import LoginTokenType
21
    >>> from canonical.launchpad.interfaces.authtoken import LoginTokenType
694
22
    >>> from canonical.launchpad.interfaces.logintoken import (
22
    >>> from canonical.launchpad.interfaces.logintoken import (
695
23
    ...     ILoginTokenSet)
23
    ...     ILoginTokenSet)
696
24
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
697
24
    >>> from lp.registry.model.person import PersonSet
25
    >>> from lp.registry.model.person import PersonSet
698
25
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
699
26
26
700
27
    # To simplify our tests we'll use the PersonSet() class directly instead
27
    # To simplify our tests we'll use the PersonSet() class directly instead
701
28
    # of gettint it as a zope secured utility. If we don't do that we'd have
28
    # of gettint it as a zope secured utility. If we don't do that we'd have
702
29
29
703
=== modified file 'lib/canonical/launchpad/doc/logintoken.txt'
704
--- lib/canonical/launchpad/doc/logintoken.txt	2009-05-12 01:39:29 +0000
705
+++ lib/canonical/launchpad/doc/logintoken.txt	2010-10-21 19:08:55 +0000
706
@@ -18,12 +18,12 @@
707
18
    4) The token is now marked as consumed, together with any other
18
    4) The token is now marked as consumed, together with any other
708
19
       tokens of the same type and for the same email address.
19
       tokens of the same type and for the same email address.
709
20
20
710
21
    >>> from canonical.launchpad.interfaces.authtoken import LoginTokenType
711
21
    >>> from lp.registry.model.person import Person
22
    >>> from lp.registry.model.person import Person
712
22
    >>> from canonical.launchpad.interfaces.authtoken import LoginTokenType
713
23
    >>> from canonical.launchpad.interfaces.logintoken import (
23
    >>> from canonical.launchpad.interfaces.logintoken import (
714
24
    ...     ILoginTokenSet)
24
    ...     ILoginTokenSet)
715
25
    >>> from canonical.database.sqlbase import flush_database_updates
716
25
    >>> from lp.services.mail import stub
26
    >>> from lp.services.mail import stub
717
26
    >>> from canonical.database.sqlbase import flush_database_updates
718
27
    >>> import transaction
27
    >>> import transaction
719
28
    >>> foobar = Person.byName('name16')
28
    >>> foobar = Person.byName('name16')
720
29
29
721
@@ -96,8 +96,8 @@
722
96
our own making.
96
our own making.
723
97
97
724
98
    >>> import pytz
98
    >>> import pytz
725
99
    >>> from zope.security.proxy import removeSecurityProxy
726
99
    >>> from datetime import datetime
100
    >>> from datetime import datetime
727
100
    >>> from zope.security.proxy import removeSecurityProxy
728
101
101
729
102
    >>> token = removeSecurityProxy(token)
102
    >>> token = removeSecurityProxy(token)
730
103
    >>> token.date_consumed = datetime(
103
    >>> token.date_consumed = datetime(
731
104
104
732
=== modified file 'lib/canonical/launchpad/doc/looptuner.txt'
733
--- lib/canonical/launchpad/doc/looptuner.txt	2010-04-07 15:57:55 +0000
734
+++ lib/canonical/launchpad/doc/looptuner.txt	2010-10-21 19:08:55 +0000
735
@@ -20,8 +20,8 @@
736
20
20
737
21
    >>> import math
21
    >>> import math
738
22
    >>> from zope.interface import implements
22
    >>> from zope.interface import implements
739
23
    >>> from canonical.launchpad.interfaces.looptuner import ITunableLoop
740
23
    >>> from canonical.launchpad.utilities.looptuner import LoopTuner
24
    >>> from canonical.launchpad.utilities.looptuner import LoopTuner
741
24
    >>> from canonical.launchpad.interfaces.looptuner import ITunableLoop
742
25
25
743
26
The LoopTuner requires the operation you define for it to implement the
26
The LoopTuner requires the operation you define for it to implement the
744
27
ITunableLoop interface.
27
ITunableLoop interface.
745
28
28
746
=== modified file 'lib/canonical/launchpad/doc/lower-case-text-widget.txt'
747
--- lib/canonical/launchpad/doc/lower-case-text-widget.txt	2010-10-09 16:36:22 +0000
748
+++ lib/canonical/launchpad/doc/lower-case-text-widget.txt	2010-10-21 19:08:55 +0000
749
@@ -7,9 +7,9 @@
750
7
LowerCaseTextWidget can be used to automatically convert the input to
7
LowerCaseTextWidget can be used to automatically convert the input to
751
8
lower case:
8
lower case:
752
9
9
753
10
  >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
754
11
  >>> from canonical.widgets.textwidgets import LowerCaseTextWidget
755
10
  >>> from lp.bugs.interfaces.bug import IBug
12
  >>> from lp.bugs.interfaces.bug import IBug
756
11
  >>> from canonical.widgets.textwidgets import LowerCaseTextWidget
757
12
  >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
758
13
  >>> field = IBug['description']
13
  >>> field = IBug['description']
759
14
  >>> request = LaunchpadTestRequest(form={'field.description':'Foo'})
14
  >>> request = LaunchpadTestRequest(form={'field.description':'Foo'})
760
15
  >>> widget = LowerCaseTextWidget(field, request)
15
  >>> widget = LowerCaseTextWidget(field, request)
761
16
16
762
=== modified file 'lib/canonical/launchpad/doc/menus.txt'
763
--- lib/canonical/launchpad/doc/menus.txt	2009-10-21 17:41:20 +0000
764
+++ lib/canonical/launchpad/doc/menus.txt	2010-10-21 19:08:55 +0000
765
@@ -341,8 +341,8 @@
766
341
    # We need to use a real launchpad test request so the view adapter
341
    # We need to use a real launchpad test request so the view adapter
767
342
    # lookups will work.  That request also needs to implement
342
    # lookups will work.  That request also needs to implement
768
343
    # IParticipation so that the login machinery will work.
343
    # IParticipation so that the login machinery will work.
769
344
    >>> from zope.security.interfaces import IParticipation
770
344
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
345
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
771
345
    >>> from zope.security.interfaces import IParticipation
772
346
    >>> class InteractiveTestRequest(LaunchpadTestRequest):
346
    >>> class InteractiveTestRequest(LaunchpadTestRequest):
773
347
    ...     implements(IParticipation)
347
    ...     implements(IParticipation)
774
348
    ...     principal = None
348
    ...     principal = None
775
@@ -687,10 +687,10 @@
776
687
link should appear linked. The request is also set as the menu's
687
link should appear linked. The request is also set as the menu's
777
688
'request' attribute.
688
'request' attribute.
778
689
689
779
690
    >>> from zope.publisher.interfaces.browser import IBrowserRequest
780
691
    >>> from zope.publisher.interfaces.http import IHTTPApplicationRequest
781
690
    >>> from canonical.launchpad.ftests import test_tales
692
    >>> from canonical.launchpad.ftests import test_tales
782
691
    >>> from canonical.launchpad.webapp import LaunchpadView
693
    >>> from canonical.launchpad.webapp import LaunchpadView
783
692
    >>> from zope.publisher.interfaces.http import IHTTPApplicationRequest
784
693
    >>> from zope.publisher.interfaces.browser import IBrowserRequest
785
694
    >>> from canonical.launchpad.webapp.vhosts import allvhosts
694
    >>> from canonical.launchpad.webapp.vhosts import allvhosts
786
695
    >>> class FakeRequest:
695
    >>> class FakeRequest:
787
696
    ...     implements(IHTTPApplicationRequest, IBrowserRequest)
696
    ...     implements(IHTTPApplicationRequest, IBrowserRequest)
788
697
697
789
=== modified file 'lib/canonical/launchpad/doc/message.txt'
790
--- lib/canonical/launchpad/doc/message.txt	2010-10-09 16:36:22 +0000
791
+++ lib/canonical/launchpad/doc/message.txt	2010-10-21 19:08:55 +0000
792
@@ -4,8 +4,9 @@
793
4
various parts of launchpad. Currently, it is used by Malone for comments
4
various parts of launchpad. Currently, it is used by Malone for comments
794
5
on bugs. Bugs are linked to Messages via the BugMessage table.
5
on bugs. Bugs are linked to Messages via the BugMessage table.
795
6
6
798
7
    >>> from canonical.launchpad.interfaces import (
7
    >>> from canonical.launchpad.webapp.interfaces import IOpenLaunchBag
799
8
    ...     IBugMessageSet, IBugSet, IOpenLaunchBag)
8
    >>> from lp.bugs.interfaces.bug import IBugSet
800
9
    >>> from lp.bugs.interfaces.bugmessage import IBugMessageSet
801
9
    >>> login('foo.bar@canonical.com')
10
    >>> login('foo.bar@canonical.com')
802
10
    >>> bugmessageset = getUtility(IBugMessageSet)
11
    >>> bugmessageset = getUtility(IBugMessageSet)
803
11
    >>> bug_one = getUtility(IBugSet).get(1)
12
    >>> bug_one = getUtility(IBugSet).get(1)
804
12
13
805
=== modified file 'lib/canonical/launchpad/doc/navigation.txt'
806
--- lib/canonical/launchpad/doc/navigation.txt	2010-10-03 15:30:06 +0000
807
+++ lib/canonical/launchpad/doc/navigation.txt	2010-10-21 19:08:55 +0000
808
@@ -269,8 +269,8 @@
809
269
Once registered, we can look the navigation up using getMultiAdapter().
269
Once registered, we can look the navigation up using getMultiAdapter().
810
270
270
811
271
    >>> from zope.component import getMultiAdapter
271
    >>> from zope.component import getMultiAdapter
812
272
    >>> from zope.publisher.interfaces.browser import IBrowserPublisher
813
272
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
273
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
814
273
    >>> from zope.publisher.interfaces.browser import IBrowserPublisher
815
274
    >>> navigation = getMultiAdapter(
274
    >>> navigation = getMultiAdapter(
816
275
    ...     (thingset, LaunchpadTestRequest()), IBrowserPublisher, name='')
275
    ...     (thingset, LaunchpadTestRequest()), IBrowserPublisher, name='')
817
276
276
818
277
277
819
=== modified file 'lib/canonical/launchpad/doc/new-line-to-spaces-widget.txt'
820
--- lib/canonical/launchpad/doc/new-line-to-spaces-widget.txt	2010-10-09 16:36:22 +0000
821
+++ lib/canonical/launchpad/doc/new-line-to-spaces-widget.txt	2010-10-21 19:08:55 +0000
822
@@ -3,8 +3,8 @@
823
3
3
824
4
This custom widget is used to replace new line characters to spaces.
4
This custom widget is used to replace new line characters to spaces.
825
5
5
826
6
  >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
827
6
  >>> from canonical.widgets.bugtask import NewLineToSpacesWidget
7
  >>> from canonical.widgets.bugtask import NewLineToSpacesWidget
828
7
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
829
8
  >>> from lp.bugs.interfaces.bugtask import IBugTaskSearch
8
  >>> from lp.bugs.interfaces.bugtask import IBugTaskSearch
830
9
9
831
10
We pass a string with some new line characters to the widget
10
We pass a string with some new line characters to the widget
832
11
11
833
=== modified file 'lib/canonical/launchpad/doc/notification-recipient-set.txt'
834
--- lib/canonical/launchpad/doc/notification-recipient-set.txt	2010-10-09 16:36:22 +0000
835
+++ lib/canonical/launchpad/doc/notification-recipient-set.txt	2010-10-21 19:08:55 +0000
836
@@ -15,8 +15,8 @@
837
15
You can use it as is or derive from it
15
You can use it as is or derive from it
838
16
(see bugnotificationrecipients.txt for an example of a derivation).
16
(see bugnotificationrecipients.txt for an example of a derivation).
839
17
17
840
18
    >>> from canonical.launchpad.interfaces.launchpad import INotificationRecipientSet
841
18
    >>> from canonical.launchpad.webapp.testing import verifyObject
19
    >>> from canonical.launchpad.webapp.testing import verifyObject
842
19
    >>> from canonical.launchpad.interfaces.launchpad import INotificationRecipientSet
843
20
    >>> from canonical.launchpad.mailnotification import (
20
    >>> from canonical.launchpad.mailnotification import (
844
21
    ...     NotificationRecipientSet)
21
    ...     NotificationRecipientSet)
845
22
22
846
23
23
847
=== modified file 'lib/canonical/launchpad/doc/notification-text-escape.txt'
848
--- lib/canonical/launchpad/doc/notification-text-escape.txt	2008-04-16 16:28:14 +0000
849
+++ lib/canonical/launchpad/doc/notification-text-escape.txt	2010-10-21 19:08:55 +0000
850
@@ -41,8 +41,8 @@
851
41
IStructuredString interface, then a string will be returned with the
41
IStructuredString interface, then a string will be returned with the
852
42
appropriate sections escaped and unescaped.
42
appropriate sections escaped and unescaped.
853
43
43
854
44
    >>> from canonical.launchpad.webapp.interfaces import IStructuredString
855
44
    >>> from canonical.launchpad.webapp.menu import structured
45
    >>> from canonical.launchpad.webapp.menu import structured
856
45
    >>> from canonical.launchpad.webapp.interfaces import IStructuredString
857
46
    >>> msg = u'<b>%(escaped)s</b>'
46
    >>> msg = u'<b>%(escaped)s</b>'
858
47
    >>> structured_text = structured(msg, escaped=u'<br/>foo')
47
    >>> structured_text = structured(msg, escaped=u'<br/>foo')
859
48
    >>> IStructuredString.providedBy(structured_text)
48
    >>> IStructuredString.providedBy(structured_text)
860
49
49
861
=== modified file 'lib/canonical/launchpad/doc/oauth-pages.txt'
862
--- lib/canonical/launchpad/doc/oauth-pages.txt	2009-06-12 16:36:02 +0000
863
+++ lib/canonical/launchpad/doc/oauth-pages.txt	2010-10-21 19:08:55 +0000
864
@@ -32,6 +32,28 @@
865
32
    ...         if tag.attrMap['value']:
32
    ...         if tag.attrMap['value']:
866
33
    ...             print tag.attrMap['name'], tag.attrMap['value']
33
    ...             print tag.attrMap['name'], tag.attrMap['value']
867
34
34
868
35
When the client doesn't specify a duration, the resulting request
869
36
token will have no expiration date set.
870
37
871
38
    >>> from datetime import datetime
872
39
    >>> view, token = get_view_with_fresh_token({})
873
40
    >>> view.reviewToken(OAuthPermission.READ_PRIVATE, None)
874
41
    >>> print token.date_expires
875
42
    None
876
43
877
44
When the client specifies a duration, the resulting request
878
45
token will have an appropriate expiration date set.
879
46
880
47
    >>> from datetime import datetime
881
48
    >>> import pytz
882
49
    >>> from canonical.launchpad.browser.oauth import (
883
50
    ...     TemporaryIntegrations)
884
51
    >>> view, token = get_view_with_fresh_token({})
885
52
    >>> view.reviewToken(
886
53
    ...     OAuthPermission.READ_PRIVATE, TemporaryIntegrations.HOUR)
887
54
    >>> token.date_expires > datetime.now(pytz.timezone('UTC'))
888
55
    True
889
56
890
35
When the consumer doesn't specify a context, the token will not have a
57
When the consumer doesn't specify a context, the token will not have a
891
36
context either.
58
context either.
892
37
59
893
@@ -45,7 +67,7 @@
894
45
    loggingout...
67
    loggingout...
895
46
    oauth_token...
68
    oauth_token...
896
47
69
898
48
    >>> view.reviewToken(OAuthPermission.READ_PRIVATE)
70
    >>> view.reviewToken(OAuthPermission.READ_PRIVATE, None)
899
49
    >>> token.person.name
71
    >>> token.person.name
900
50
    u'salgado'
72
    u'salgado'
901
51
    >>> print token.context
73
    >>> print token.context
902
@@ -69,7 +91,7 @@
903
69
    oauth_token...
91
    oauth_token...
904
70
    lp.context firefox
92
    lp.context firefox
905
71
93
907
72
    >>> view.reviewToken(OAuthPermission.READ_PUBLIC)
94
    >>> view.reviewToken(OAuthPermission.READ_PUBLIC, None)
908
73
    >>> token.context.name
95
    >>> token.context.name
909
74
    u'firefox'
96
    u'firefox'
910
75
97
911
@@ -86,7 +108,7 @@
912
86
    oauth_token...
108
    oauth_token...
913
87
    lp.context mozilla
109
    lp.context mozilla
914
88
110
916
89
    >>> view.reviewToken(OAuthPermission.READ_PUBLIC)
111
    >>> view.reviewToken(OAuthPermission.READ_PUBLIC, None)
917
90
    >>> token.context.name
112
    >>> token.context.name
918
91
    u'mozilla'
113
    u'mozilla'
919
92
114
920
@@ -103,7 +125,7 @@
921
103
    oauth_token...
125
    oauth_token...
922
104
    lp.context ubuntu
126
    lp.context ubuntu
923
105
127
925
106
    >>> view.reviewToken(OAuthPermission.READ_PUBLIC)
128
    >>> view.reviewToken(OAuthPermission.READ_PUBLIC, None)
926
107
    >>> token.context.name
129
    >>> token.context.name
927
108
    u'ubuntu'
130
    u'ubuntu'
928
109
131
929
@@ -122,7 +144,7 @@
930
122
    oauth_token...
144
    oauth_token...
931
123
    lp.context ubuntu/evolution
145
    lp.context ubuntu/evolution
932
124
146
934
125
    >>> view.reviewToken(OAuthPermission.READ_PUBLIC)
147
    >>> view.reviewToken(OAuthPermission.READ_PUBLIC, None)
935
126
    >>> token.context.title
148
    >>> token.context.title
936
127
    u'...evolution... package in Ubuntu'
149
    u'...evolution... package in Ubuntu'
937
128
150
938
129
151
939
=== modified file 'lib/canonical/launchpad/doc/oauth.txt'
940
--- lib/canonical/launchpad/doc/oauth.txt	2010-10-21 19:08:53 +0000
941
+++ lib/canonical/launchpad/doc/oauth.txt	2010-10-21 19:08:55 +0000
942
@@ -17,8 +17,13 @@
943
17
17
944
18
Here's a quick demonstration of the behavior.
18
Here's a quick demonstration of the behavior.
945
19
19
946
20
   >>> login('foo.bar@canonical.com')
947
21
   >>> access_token = factory.makeOAuthAccessToken()
948
22
   >>> logout()
949
23
950
20
- We can use a nonce.
24
- We can use a nonce.
951
21
25
952
26
    >>> from canonical.launchpad.interfaces.oauth import IOAuthNonce
953
22
    >>> import time
27
    >>> import time
954
23
    >>> now = time.time() - 1
28
    >>> now = time.time() - 1
955
24
    >>> nonce1 = access_token.checkNonceAndTimestamp('boo', now)
29
    >>> nonce1 = access_token.checkNonceAndTimestamp('boo', now)
956
25
30
957
=== modified file 'lib/canonical/launchpad/doc/object-privacy.txt'
958
--- lib/canonical/launchpad/doc/object-privacy.txt	2010-10-03 15:30:06 +0000
959
+++ lib/canonical/launchpad/doc/object-privacy.txt	2010-10-21 19:08:55 +0000
960
@@ -8,8 +8,9 @@
961
8
IObjectPrivacy and check its is_private attribute.
8
IObjectPrivacy and check its is_private attribute.
962
9
9
963
10
    >>> from canonical.lazr.interfaces import IObjectPrivacy
10
    >>> from canonical.lazr.interfaces import IObjectPrivacy
966
11
    >>> from canonical.launchpad.interfaces import (
11
    >>> from lp.answers.interfaces.questioncollection import IQuestionSet
967
12
    ...     IBugSet, IPersonSet, IQuestionSet)
12
    >>> from lp.bugs.interfaces.bug import IBugSet
968
13
    >>> from lp.registry.interfaces.person import IPersonSet
969
13
    >>> bug = getUtility(IBugSet).get(1)
14
    >>> bug = getUtility(IBugSet).get(1)
970
14
    >>> bug.private
15
    >>> bug.private
971
15
    False
16
    False
972
16
17
973
=== modified file 'lib/canonical/launchpad/doc/package-relationship.txt'
974
--- lib/canonical/launchpad/doc/package-relationship.txt	2010-10-09 16:36:22 +0000
975
+++ lib/canonical/launchpad/doc/package-relationship.txt	2010-10-21 19:08:55 +0000
976
@@ -54,8 +54,8 @@
977
54
Now for each parsed element we can build an IPackageRelationship:
54
Now for each parsed element we can build an IPackageRelationship:
978
55
55
979
56
  >>> from canonical.launchpad.browser import PackageRelationship
56
  >>> from canonical.launchpad.browser import PackageRelationship
980
57
  >>> from canonical.launchpad.interfaces.packagerelationship import IPackageRelationship
981
57
  >>> from canonical.launchpad.webapp.testing import verifyObject
58
  >>> from canonical.launchpad.webapp.testing import verifyObject
982
58
  >>> from canonical.launchpad.interfaces.packagerelationship import IPackageRelationship
983
59
59
984
60
  >>> name, version, operator = parsed_relationships[1]
60
  >>> name, version, operator = parsed_relationships[1]
985
61
  >>> fake_url = 'http://host/path'
61
  >>> fake_url = 'http://host/path'
986
62
62
987
=== modified file 'lib/canonical/launchpad/doc/presenting-lengths-of-time.txt'
988
--- lib/canonical/launchpad/doc/presenting-lengths-of-time.txt	2005-10-31 18:29:12 +0000
989
+++ lib/canonical/launchpad/doc/presenting-lengths-of-time.txt	2010-10-21 19:08:55 +0000
990
@@ -3,8 +3,8 @@
991
3
3
992
4
First, let's bring in some dependencies:
4
First, let's bring in some dependencies:
993
5
5
994
6
   >>> from canonical.launchpad.ftests import test_tales
995
6
   >>> from datetime import timedelta
7
   >>> from datetime import timedelta
996
7
   >>> from canonical.launchpad.ftests import test_tales
997
8
8
998
9
Exact Duration
9
Exact Duration
999
10
--------------
10
--------------
1000
11
11
1001
=== modified file 'lib/canonical/launchpad/doc/project-scope-widget.txt'
1002
--- lib/canonical/launchpad/doc/project-scope-widget.txt	2010-10-09 16:36:22 +0000
1003
+++ lib/canonical/launchpad/doc/project-scope-widget.txt	2010-10-21 19:08:55 +0000
1004
@@ -7,9 +7,9 @@
1005
7
we will use the Project vocabulary which allows any project to be
7
we will use the Project vocabulary which allows any project to be
1006
8
selected.
8
selected.
1007
9
9
1008
10
    >>> from canonical.launchpad.webapp.testing import verifyObject
1009
11
    >>> from zope.schema import Choice
10
    >>> from zope.schema import Choice
1010
12
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
11
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
1011
12
    >>> from canonical.launchpad.webapp.testing import verifyObject
1012
13
    >>> from canonical.widgets.project import ProjectScopeWidget
13
    >>> from canonical.widgets.project import ProjectScopeWidget
1013
14
14
1014
15
    >>> empty_request = LaunchpadTestRequest()
15
    >>> empty_request = LaunchpadTestRequest()
1015
@@ -21,8 +21,8 @@
1016
21
21
1017
22
The widget complies to both IInputWidget and IBrowserWidget.
22
The widget complies to both IInputWidget and IBrowserWidget.
1018
23
23
1019
24
    >>> from zope.app.form.browser.interfaces import IBrowserWidget
1020
24
    >>> from zope.app.form.interfaces import IInputWidget
25
    >>> from zope.app.form.interfaces import IInputWidget
1021
25
    >>> from zope.app.form.browser.interfaces import IBrowserWidget
1022
26
    >>> verifyObject(IInputWidget, widget)
26
    >>> verifyObject(IInputWidget, widget)
1023
27
    True
27
    True
1024
28
    >>> verifyObject(IBrowserWidget, widget)
28
    >>> verifyObject(IBrowserWidget, widget)
1025
29
29
1026
=== modified file 'lib/canonical/launchpad/doc/security-proxies.txt'
1027
--- lib/canonical/launchpad/doc/security-proxies.txt	2010-10-17 02:00:18 +0000
1028
+++ lib/canonical/launchpad/doc/security-proxies.txt	2010-10-21 19:08:55 +0000
1029
@@ -45,8 +45,8 @@
1030
45
XXX: bug 3315
45
XXX: bug 3315
1031
46
DB schema objects should be comparable correctly when proxied...
46
DB schema objects should be comparable correctly when proxied...
1032
47
47
1035
48
    >>> from canonical.launchpad.interfaces import (
48
    >>> from lp.registry.interfaces.distroseries import IDistroSeriesSet
1036
49
    ...     SeriesStatus, IDistroSeriesSet)
49
    >>> from lp.registry.interfaces.series import SeriesStatus
1037
50
    >>> hoary = getUtility(IDistroSeriesSet).get(3)
50
    >>> hoary = getUtility(IDistroSeriesSet).get(3)
1038
51
    >>> print hoary.status.name
51
    >>> print hoary.status.name
1039
52
    DEVELOPMENT
52
    DEVELOPMENT
1040
53
53
1041
=== modified file 'lib/canonical/launchpad/doc/signedmessage.txt'
1042
--- lib/canonical/launchpad/doc/signedmessage.txt	2007-08-09 14:49:07 +0000
1043
+++ lib/canonical/launchpad/doc/signedmessage.txt	2010-10-21 19:08:55 +0000
1044
@@ -6,9 +6,9 @@
1045
6
SignedMessage as the _class parameter, but it also ensures that all
6
SignedMessage as the _class parameter, but it also ensures that all
1046
7
the attributes are correctly set.
7
the attributes are correctly set.
1047
8
8
1048
9
    >>> from canonical.launchpad.interfaces.mail import ISignedMessage
1049
10
    >>> from canonical.launchpad.mail import signed_message_from_string
1050
9
    >>> from canonical.launchpad.webapp.testing import verifyObject
11
    >>> from canonical.launchpad.webapp.testing import verifyObject
1051
10
    >>> from canonical.launchpad.mail import signed_message_from_string
1052
11
    >>> from canonical.launchpad.interfaces.mail import ISignedMessage
1053
12
    >>> msg = signed_message_from_string('To: someone\n\nHello.')
12
    >>> msg = signed_message_from_string('To: someone\n\nHello.')
1054
13
    >>> verifyObject(ISignedMessage, msg)
13
    >>> verifyObject(ISignedMessage, msg)
1055
14
    True
14
    True
1056
15
15
1057
=== modified file 'lib/canonical/launchpad/doc/sqlobject-security-proxies.txt'
1058
--- lib/canonical/launchpad/doc/sqlobject-security-proxies.txt	2010-10-03 15:30:06 +0000
1059
+++ lib/canonical/launchpad/doc/sqlobject-security-proxies.txt	2010-10-21 19:08:55 +0000
1060
@@ -3,9 +3,9 @@
1061
3
3
1062
4
Do some imports.
4
Do some imports.
1063
5
5
1064
6
    >>> from zope.component import getUtility
1065
7
    >>> from lp.bugs.model.bug import BugTask
1066
6
    >>> from lp.registry.interfaces.person import IPersonSet
8
    >>> from lp.registry.interfaces.person import IPersonSet
1067
7
    >>> from lp.bugs.model.bug import BugTask
1068
8
    >>> from zope.component import getUtility
1069
9
9
1070
10
Login as Mark.
10
Login as Mark.
1071
11
11
1072
12
12
1073
=== modified file 'lib/canonical/launchpad/doc/storm.txt'
1074
--- lib/canonical/launchpad/doc/storm.txt	2010-10-03 15:30:06 +0000
1075
+++ lib/canonical/launchpad/doc/storm.txt	2010-10-21 19:08:55 +0000
1076
@@ -6,14 +6,21 @@
1077
6
In addition to what Storm provides, we also have some Launchpad
6
In addition to what Storm provides, we also have some Launchpad
1078
7
specific Storm tools to cope with our master and slave store arrangement.
7
specific Storm tools to cope with our master and slave store arrangement.
1079
8
8
1083
9
    >>> from canonical.launchpad.interfaces import (
9
    >>> from canonical.launchpad.interfaces.emailaddress import (
1084
10
    ...     EmailAddressStatus, IEmailAddressSet,
10
    ...     EmailAddressStatus,
1085
11
    ...     IMasterObject, IMasterStore, ISlaveStore, IStore)
11
    ...     IEmailAddressSet,
1086
12
    ...     )
1087
13
    >>> from canonical.launchpad.interfaces.lpstorm import (
1088
14
    ...     IMasterObject,
1089
15
    ...     IMasterStore,
1090
16
    ...     ISlaveStore,
1091
17
    ...     IStore,
1092
18
    ...     )
1093
12
    >>> from canonical.launchpad.database import (
19
    >>> from canonical.launchpad.database import (
1094
13
    ...     Account, AccountPassword, EmailAddress)
20
    ...     Account, AccountPassword, EmailAddress)
1095
21
    >>> from zope.security.proxy import ProxyFactory
1096
14
    >>> from lp.registry.interfaces.person import IPersonSet
22
    >>> from lp.registry.interfaces.person import IPersonSet
1097
15
    >>> from lp.registry.model.person import Person
23
    >>> from lp.registry.model.person import Person
1098
16
    >>> from zope.security.proxy import ProxyFactory
1099
17
24
1100
18
25
1101
19
You need to use the correct master Store to make changes to
26
You need to use the correct master Store to make changes to
1102
20
27
1103
=== modified file 'lib/canonical/launchpad/doc/stripped-text-widget.txt'
1104
--- lib/canonical/launchpad/doc/stripped-text-widget.txt	2010-10-09 16:36:22 +0000
1105
+++ lib/canonical/launchpad/doc/stripped-text-widget.txt	2010-10-21 19:08:55 +0000
1106
@@ -30,8 +30,8 @@
1107
30
30
1108
31
This custom widget is used to strip leading and trailing whitespaces.
31
This custom widget is used to strip leading and trailing whitespaces.
1109
32
32
1110
33
  >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
1111
33
  >>> from canonical.widgets.textwidgets import StrippedTextWidget
34
  >>> from canonical.widgets.textwidgets import StrippedTextWidget
1112
34
  >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
1113
35
  >>> from lp.bugs.interfaces.bugtracker import IRemoteBug
35
  >>> from lp.bugs.interfaces.bugtracker import IRemoteBug
1114
36
36
1115
37
We pass a string with leading and trailing whitespaces to the widget
37
We pass a string with leading and trailing whitespaces to the widget
1116
38
38
1117
=== modified file 'lib/canonical/launchpad/doc/textsearching.txt'
1118
--- lib/canonical/launchpad/doc/textsearching.txt	2010-10-09 16:36:22 +0000
1119
+++ lib/canonical/launchpad/doc/textsearching.txt	2010-10-21 19:08:55 +0000
1120
@@ -602,8 +602,8 @@
1121
602
rows will be excluded from the final search.
602
rows will be excluded from the final search.
1122
603
603
1123
604
    >>> from canonical.database.nl_search import nl_phrase_search
604
    >>> from canonical.database.nl_search import nl_phrase_search
1124
605
    >>> from canonical.database.sqlbase import quote
1125
605
    >>> from lp.answers.model.question import Question
606
    >>> from lp.answers.model.question import Question
1126
606
    >>> from canonical.database.sqlbase import quote
1127
607
607
1128
608
More than 50% of the questions matches firefox:
608
More than 50% of the questions matches firefox:
1129
609
609
1130
@@ -689,8 +689,8 @@
1131
689
For example, there are less than 5 questions filed on the
689
For example, there are less than 5 questions filed on the
1132
690
mozilla-firefox source package.
690
mozilla-firefox source package.
1133
691
691
1134
692
    >>> from canonical.database.sqlbase import sqlvalues
1135
692
    >>> from lp.registry.interfaces.distribution import IDistributionSet
693
    >>> from lp.registry.interfaces.distribution import IDistributionSet
1136
693
    >>> from canonical.database.sqlbase import sqlvalues
1137
694
    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
694
    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
1138
695
    >>> firefox_package = ubuntu.getSourcePackage('mozilla-firefox')
695
    >>> firefox_package = ubuntu.getSourcePackage('mozilla-firefox')
1139
696
    >>> firefox_package_questions = Question.select(
696
    >>> firefox_package_questions = Question.select(
1140
697
697
1141
=== modified file 'lib/canonical/launchpad/doc/timeout.txt'
1142
--- lib/canonical/launchpad/doc/timeout.txt	2010-10-02 20:58:22 +0000
1143
+++ lib/canonical/launchpad/doc/timeout.txt	2010-10-21 19:08:55 +0000
1144
@@ -26,8 +26,8 @@
1145
26
The timeout to use is the number of seconds remaining before
26
The timeout to use is the number of seconds remaining before
1146
27
db_statement_timeout is expired.
27
db_statement_timeout is expired.
1147
28
28
1148
29
    >>> from canonical.config import config
1149
29
    >>> from textwrap import dedent
30
    >>> from textwrap import dedent
1150
30
    >>> from canonical.config import config
1151
31
    >>> config.push('timeout', dedent('''\
31
    >>> config.push('timeout', dedent('''\
1152
32
    ... [database]
32
    ... [database]
1153
33
    ... db_statement_timeout = 10000'''))
33
    ... db_statement_timeout = 10000'''))
1154
@@ -88,9 +88,9 @@
1155
88
88
1156
89
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
89
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
1157
90
    >>> from lp.services.features.model import FeatureFlag, getFeatureStore
90
    >>> from lp.services.features.model import FeatureFlag, getFeatureStore
1158
91
    >>> from lp.services.features import per_thread
1159
92
    >>> from lp.services.features.flags import FeatureController
1160
91
    >>> from lp.services.features.webapp import ScopesFromRequest
93
    >>> from lp.services.features.webapp import ScopesFromRequest
1161
92
    >>> from lp.services.features.flags import FeatureController
1162
93
    >>> from lp.services.features import per_thread
1163
94
94
1164
95
Install the feature flag to increase the timeout value.
95
Install the feature flag to increase the timeout value.
1165
96
96
1166
97
97
1167
=== modified file 'lib/canonical/launchpad/doc/tokens-text-widget.txt'
1168
--- lib/canonical/launchpad/doc/tokens-text-widget.txt	2010-10-09 16:36:22 +0000
1169
+++ lib/canonical/launchpad/doc/tokens-text-widget.txt	2010-10-21 19:08:55 +0000
1170
@@ -3,8 +3,8 @@
1171
3
This custom widget is used to normalise the space between words,
3
This custom widget is used to normalise the space between words,
1172
4
strip punctuation, and strip leading and trailing whitespace.
4
strip punctuation, and strip leading and trailing whitespace.
1173
5
5
1174
6
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
1175
6
    >>> from canonical.widgets.textwidgets import TokensTextWidget
7
    >>> from canonical.widgets.textwidgets import TokensTextWidget
1176
7
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
1177
8
    >>> from lp.answers.interfaces.faq import IFAQ
8
    >>> from lp.answers.interfaces.faq import IFAQ
1178
9
9
1179
10
The IFAQ keywords field requires a space separated list of terms. In the
10
The IFAQ keywords field requires a space separated list of terms. In the
1180
11
11
1181
=== modified file 'lib/canonical/launchpad/doc/validation.txt'
1182
--- lib/canonical/launchpad/doc/validation.txt	2010-10-10 15:39:28 +0000
1183
+++ lib/canonical/launchpad/doc/validation.txt	2010-10-21 19:08:55 +0000
1184
@@ -7,9 +7,10 @@
1185
7
The validate_distrotask() function is used to guarantee that distribution
7
The validate_distrotask() function is used to guarantee that distribution
1186
8
bugtasks are unique per bug.
8
bugtasks are unique per bug.
1187
9
9
1191
10
    >>> from canonical.launchpad.interfaces import (
10
    >>> from canonical.launchpad.interfaces import validate_distrotask
1192
11
    ...     IBugSet, IDistributionSet, ISourcePackageNameSet,
11
    >>> from lp.bugs.interfaces.bug import IBugSet
1193
12
    ...     validate_distrotask)
12
    >>> from lp.registry.interfaces.distribution import IDistributionSet
1194
13
    >>> from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
1195
13
    >>> bug_two = getUtility(IBugSet).get(2)
14
    >>> bug_two = getUtility(IBugSet).get(2)
1196
14
    >>> debian = getUtility(IDistributionSet).getByName('debian')
15
    >>> debian = getUtility(IDistributionSet).getByName('debian')
1197
15
    >>> mozilla_firefox = getUtility(
16
    >>> mozilla_firefox = getUtility(
1198
@@ -31,8 +32,8 @@
1199
31
If the bug already has a distribution task with no source package, it's
32
If the bug already has a distribution task with no source package, it's
1200
32
not possible to add a another one.
33
not possible to add a another one.
1201
33
34
1204
34
    >>> from canonical.launchpad.interfaces import (
35
    >>> from lp.bugs.interfaces.bug import CreateBugParams
1205
35
    ...     CreateBugParams, IDistributionSet)
36
    >>> from lp.registry.interfaces.distribution import IDistributionSet
1206
36
37
1207
37
    >>> login('no-priv@canonical.com')
38
    >>> login('no-priv@canonical.com')
1208
38
    >>> no_priv = getUtility(ILaunchBag).user
39
    >>> no_priv = getUtility(ILaunchBag).user
1209
@@ -57,8 +58,8 @@
1210
57
It's not allowed even if the sourcepackage has been published in a
58
It's not allowed even if the sourcepackage has been published in a
1211
58
PPA.
59
PPA.
1212
59
60
1213
61
    >>> from lp.soyuz.enums import PackagePublishingStatus
1214
60
    >>> from lp.soyuz.tests.ppa import publishToPPA
62
    >>> from lp.soyuz.tests.ppa import publishToPPA
1215
61
    >>> from lp.soyuz.enums import PackagePublishingStatus
1216
62
    >>> publishToPPA(
63
    >>> publishToPPA(
1217
63
    ...     person_name='cprov',
64
    ...     person_name='cprov',
1218
64
    ...     sourcepackage_name='foobar',
65
    ...     sourcepackage_name='foobar',
1219
65
66
1220
=== modified file 'lib/canonical/launchpad/doc/vocabularies.txt'
1221
--- lib/canonical/launchpad/doc/vocabularies.txt	2010-10-09 16:36:22 +0000
1222
+++ lib/canonical/launchpad/doc/vocabularies.txt	2010-10-21 19:08:55 +0000
1223
@@ -10,9 +10,11 @@
1224
10
10
1225
11
    >>> from zope.component import getUtility
11
    >>> from zope.component import getUtility
1226
12
    >>> from canonical.launchpad.ftests import ANONYMOUS, login
12
    >>> from canonical.launchpad.ftests import ANONYMOUS, login
1227
13
    >>> from canonical.launchpad.interfaces import (
1228
14
    ...     IPersonSet, IOpenLaunchBag, IProductSet, IProjectGroupSet)
1229
15
    >>> from canonical.database.sqlbase import flush_database_updates
13
    >>> from canonical.database.sqlbase import flush_database_updates
1230
14
    >>> from canonical.launchpad.webapp.interfaces import IOpenLaunchBag
1231
15
    >>> from lp.registry.interfaces.person import IPersonSet
1232
16
    >>> from lp.registry.interfaces.product import IProductSet
1233
17
    >>> from lp.registry.interfaces.projectgroup import IProjectGroupSet
1234
16
    >>> person_set = getUtility(IPersonSet)
18
    >>> person_set = getUtility(IPersonSet)
1235
17
    >>> product_set = getUtility(IProductSet)
19
    >>> product_set = getUtility(IProductSet)
1236
18
    >>> login('foo.bar@canonical.com')
20
    >>> login('foo.bar@canonical.com')
1237
@@ -395,8 +397,8 @@
1238
395
Bug watches with an email address URL (i.e. starts with "mailto:") are
397
Bug watches with an email address URL (i.e. starts with "mailto:") are
1239
396
treated differently.
398
treated differently.
1240
397
399
1243
398
    >>> from canonical.launchpad.interfaces import (
400
    >>> from lp.bugs.interfaces.bugtracker import IBugTrackerSet
1244
399
    ...     IBugWatchSet, IBugTrackerSet)
401
    >>> from lp.bugs.interfaces.bugwatch import IBugWatchSet
1245
400
402
1246
401
    >>> bug_twelve = getUtility(IBugSet).get(12)
403
    >>> bug_twelve = getUtility(IBugSet).get(12)
1247
402
    >>> email_bugtracker = getUtility(IBugTrackerSet).getByName('email')
404
    >>> email_bugtracker = getUtility(IBugTrackerSet).getByName('email')
1248
403
405
1249
=== modified file 'lib/canonical/launchpad/doc/webapp-authorization.txt'
1250
--- lib/canonical/launchpad/doc/webapp-authorization.txt	2010-10-18 10:11:04 +0000
1251
+++ lib/canonical/launchpad/doc/webapp-authorization.txt	2010-10-21 19:08:55 +0000
1252
@@ -5,8 +5,8 @@
1253
5
given object.  This is the same check available in TALES as
5
given object.  This is the same check available in TALES as
1254
6
something/required:permission.Name.
6
something/required:permission.Name.
1255
7
7
1256
8
    >>> from zope.component import getUtility
1257
8
    >>> from canonical.launchpad.webapp.authorization import check_permission
9
    >>> from canonical.launchpad.webapp.authorization import check_permission
1258
9
    >>> from zope.component import getUtility
1259
10
    >>> from lp.registry.interfaces.person import IPersonSet
10
    >>> from lp.registry.interfaces.person import IPersonSet
1260
11
11
1261
12
    >>> personset = getUtility(IPersonSet)
12
    >>> personset = getUtility(IPersonSet)
1262
@@ -60,8 +60,8 @@
1263
60
access to private objects.  For instance, the above principal has
60
access to private objects.  For instance, the above principal has
1264
61
permission to read private and non-private objects (READ_PRIVATE).
61
permission to read private and non-private objects (READ_PRIVATE).
1265
62
62
1266
63
    >>> from canonical.launchpad.ftests import syncUpdate
1267
63
    >>> from lp.bugs.interfaces.bug import IBugSet
64
    >>> from lp.bugs.interfaces.bug import IBugSet
1268
64
    >>> from canonical.launchpad.ftests import syncUpdate
1269
65
    >>> login('test@canonical.com')
65
    >>> login('test@canonical.com')
1270
66
    >>> bug_1 = getUtility(IBugSet).get(1)
66
    >>> bug_1 = getUtility(IBugSet).get(1)
1271
67
    >>> bug_1.setPrivate(True, sample_person)
67
    >>> bug_1.setPrivate(True, sample_person)
1272
68
68
1273
=== modified file 'lib/canonical/launchpad/doc/webapp-publication.txt'
1274
--- lib/canonical/launchpad/doc/webapp-publication.txt	2010-10-09 16:36:22 +0000
1275
+++ lib/canonical/launchpad/doc/webapp-publication.txt	2010-10-21 19:08:55 +0000
1276
@@ -144,8 +144,8 @@
1277
144
    ...     LaunchpadBrowserPublication)
144
    ...     LaunchpadBrowserPublication)
1278
145
    >>> from canonical.launchpad.webapp.servers import (
145
    >>> from canonical.launchpad.webapp.servers import (
1279
146
    ...     LaunchpadBrowserRequest, VirtualHostRequestPublicationFactory)
146
    ...     LaunchpadBrowserRequest, VirtualHostRequestPublicationFactory)
1280
147
    >>> from zope.app.publication.interfaces import IRequestPublicationFactory
1281
147
    >>> from canonical.launchpad.webapp.testing import verifyObject
148
    >>> from canonical.launchpad.webapp.testing import verifyObject
1282
148
    >>> from zope.app.publication.interfaces import IRequestPublicationFactory
1283
149
149
1284
150
Those factories provide the IRequestPublicationFactory interface.
150
Those factories provide the IRequestPublicationFactory interface.
1285
151
151
1286
@@ -909,10 +909,10 @@
1287
909
In the default implementation, the following database modification will
909
In the default implementation, the following database modification will
1288
910
be automatically reverted in a GET request.
910
be automatically reverted in a GET request.
1289
911
911
1290
912
    >>> from canonical.launchpad.database import EmailAddress
1291
912
    >>> from canonical.launchpad.ftests import syncUpdate
913
    >>> from canonical.launchpad.ftests import syncUpdate
1293
913
    >>> from canonical.launchpad.database import EmailAddress
914
    >>> from canonical.launchpad.interfaces.lpstorm import IMasterStore
1294
914
    >>> from lp.registry.model.person import Person
915
    >>> from lp.registry.model.person import Person
1295
915
    >>> from canonical.launchpad.interfaces.lpstorm import IMasterStore
1296
916
    >>> login('foo.bar@canonical.com')
916
    >>> login('foo.bar@canonical.com')
1297
917
    >>> txn = transaction.begin()
917
    >>> txn = transaction.begin()
1298
918
    >>> def get_foo_bar_person():
918
    >>> def get_foo_bar_person():
1299
@@ -965,13 +965,13 @@
1300
965
the OAuthNonce table.
965
the OAuthNonce table.
1301
966
966
1302
967
    >>> import time
967
    >>> import time
1303
968
    >>> from canonical.launchpad.interfaces.oauth import IOAuthConsumerSet
1304
968
    >>> from canonical.launchpad.webapp.interfaces import OAuthPermission
969
    >>> from canonical.launchpad.webapp.interfaces import OAuthPermission
1305
969
    >>> from lp.registry.interfaces.person import IPersonSet
970
    >>> from lp.registry.interfaces.person import IPersonSet
1306
970
    >>> from canonical.launchpad.interfaces.oauth import IOAuthConsumerSet
1307
971
971
1308
972
    >>> from zope.component import getUtility
1309
972
    >>> from canonical.launchpad.webapp.dbpolicy import MasterDatabasePolicy
973
    >>> from canonical.launchpad.webapp.dbpolicy import MasterDatabasePolicy
1310
973
    >>> from canonical.launchpad.webapp.interfaces import IStoreSelector
974
    >>> from canonical.launchpad.webapp.interfaces import IStoreSelector
1311
974
    >>> from zope.component import getUtility
1312
975
    >>> getUtility(IStoreSelector).push(MasterDatabasePolicy())
975
    >>> getUtility(IStoreSelector).push(MasterDatabasePolicy())
1313
976
976
1314
977
    >>> salgado = getUtility(IPersonSet).getByName('salgado')
977
    >>> salgado = getUtility(IPersonSet).getByName('salgado')
1315
978
978
1316
=== modified file 'lib/canonical/launchpad/doc/webservice-configuration.txt'
1317
--- lib/canonical/launchpad/doc/webservice-configuration.txt	2009-04-17 10:32:16 +0000
1318
+++ lib/canonical/launchpad/doc/webservice-configuration.txt	2010-10-21 19:08:55 +0000
1319
@@ -24,8 +24,8 @@
1320
24
based on the site configuration and whether the requesting user is a
24
based on the site configuration and whether the requesting user is a
1321
25
developer.
25
developer.
1322
26
26
1323
27
    >>> from canonical.config import config
1324
27
    >>> from textwrap import dedent
28
    >>> from textwrap import dedent
1325
28
    >>> from canonical.config import config
1326
29
29
1327
30
    >>> from zope.interface import implements
30
    >>> from zope.interface import implements
1328
31
    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
31
    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
1329
32
32
1330
=== modified file 'lib/canonical/launchpad/doc/webservice-marshallers.txt'
1331
--- lib/canonical/launchpad/doc/webservice-marshallers.txt	2010-10-09 16:36:22 +0000
1332
+++ lib/canonical/launchpad/doc/webservice-marshallers.txt	2010-10-21 19:08:55 +0000
1333
@@ -8,8 +8,10 @@
1334
8
application root.
8
application root.
1335
9
9
1336
10
    >>> from canonical.launchpad.webapp.adapter import set_request_started
10
    >>> from canonical.launchpad.webapp.adapter import set_request_started
1339
11
    >>> from canonical.launchpad.webapp.servers import WebServiceTestRequest
11
    >>> from canonical.launchpad.webapp.servers import (
1340
12
    >>> from canonical.launchpad.webapp.servers import WebServicePublication
12
    ...     WebServicePublication,
1341
13
    ...     WebServiceTestRequest,
1342
14
    ...     )
1343
13
    >>> request = WebServiceTestRequest(method='GET')
15
    >>> request = WebServiceTestRequest(method='GET')
1344
14
    >>> set_request_started()
16
    >>> set_request_started()
1345
15
    >>> request.setPublication(WebServicePublication(None))
17
    >>> request.setPublication(WebServicePublication(None))
1346
@@ -29,12 +31,12 @@
1347
29
string is a URL corresponding to a vocabulary item, the marshaller
31
string is a URL corresponding to a vocabulary item, the marshaller
1348
30
returns that item. Otherwise it raises a ValueError.
32
returns that item. Otherwise it raises a ValueError.
1349
31
33
1350
32
    >>> from lp.registry.interfaces.person import IPerson
1351
33
    >>> from zope.component import getMultiAdapter
34
    >>> from zope.component import getMultiAdapter
1352
34
    >>> from zope.schema import Choice
35
    >>> from zope.schema import Choice
1353
36
    >>> from lazr.restful import EntryResource
1354
35
    >>> from lazr.restful.fields import ReferenceChoice
37
    >>> from lazr.restful.fields import ReferenceChoice
1355
36
    >>> from lazr.restful.interfaces import IFieldMarshaller
38
    >>> from lazr.restful.interfaces import IFieldMarshaller
1357
37
    >>> from lazr.restful import EntryResource
39
    >>> from lp.registry.interfaces.person import IPerson
1358
38
40
1359
39
    # Bind the field, to resolve the vocabulary name.
41
    # Bind the field, to resolve the vocabulary name.
1360
40
    >>> field = ReferenceChoice(
42
    >>> field = ReferenceChoice(
1361
41
43
1362
=== modified file 'lib/canonical/launchpad/doc/xmlrpc-authserver.txt'
1363
--- lib/canonical/launchpad/doc/xmlrpc-authserver.txt	2010-10-03 15:30:06 +0000
1364
+++ lib/canonical/launchpad/doc/xmlrpc-authserver.txt	2010-10-21 19:08:55 +0000
1365
@@ -3,8 +3,10 @@
1366
3
The AuthServer interface is available on the authserver attribute
3
The AuthServer interface is available on the authserver attribute
1367
4
of our private XMLRPC instance.
4
of our private XMLRPC instance.
1368
5
5
1371
6
    >>> from canonical.launchpad.interfaces import (
6
    >>> from canonical.launchpad.interfaces.launchpad import (
1372
7
    ...     IAuthServerApplication, IPrivateApplication)
7
    ...     IAuthServerApplication,
1373
8
    ...     IPrivateApplication,
1374
9
    ...     )
1375
8
    >>> from canonical.launchpad.webapp.testing import verifyObject
10
    >>> from canonical.launchpad.webapp.testing import verifyObject
1376
9
11
1377
10
    >>> private_root = getUtility(IPrivateApplication)
12
    >>> private_root = getUtility(IPrivateApplication)
1378
11
13
1379
=== modified file 'lib/canonical/launchpad/interfaces/ftests/validation.txt'
1380
--- lib/canonical/launchpad/interfaces/ftests/validation.txt	2010-10-03 15:30:06 +0000
1381
+++ lib/canonical/launchpad/interfaces/ftests/validation.txt	2010-10-21 19:08:55 +0000
1382
@@ -1,16 +1,17 @@
1383
1
= Launchpad field validators =
1
= Launchpad field validators =
1384
2
2
1385
3
    >>> from zope.component import getUtility
3
    >>> from zope.component import getUtility
1388
4
    >>> from canonical.launchpad.interfaces import (
4
    >>> from canonical.launchpad.webapp.interfaces import IOpenLaunchBag
1389
5
    ...     CreateBugParams, IOpenLaunchBag, IPersonSet, IProductSet)
5
    >>> from lp.bugs.interfaces.bug import CreateBugParams
1390
6
    >>> from lp.registry.interfaces.person import IPersonSet
1391
7
    >>> from lp.registry.interfaces.product import IProductSet
1392
6
8
1393
7
== can_be_nominated_for_series ==
9
== can_be_nominated_for_series ==
1394
8
10
1395
9
This validator is used to check if the bug in the launchbag can be
11
This validator is used to check if the bug in the launchbag can be
1396
10
nominated for the given series.
12
nominated for the given series.
1397
11
13
1400
12
    >>> from canonical.launchpad.interfaces import (
14
    >>> from canonical.launchpad.interfaces import can_be_nominated_for_series
1399
13
    ...     can_be_nominated_for_series)
1401
14
15
1402
15
If we create a new bug, all the target's series can be nominated.
16
If we create a new bug, all the target's series can be nominated.
1403
16
17
1404
17
18
1405
=== modified file 'lib/canonical/launchpad/pagetests/feeds/xx-links.txt'
1406
--- lib/canonical/launchpad/pagetests/feeds/xx-links.txt	2010-10-03 15:30:06 +0000
1407
+++ lib/canonical/launchpad/pagetests/feeds/xx-links.txt	2010-10-21 19:08:55 +0000
1408
@@ -116,8 +116,11 @@
1409
116
    >>> from canonical.database.sqlbase import flush_database_updates
116
    >>> from canonical.database.sqlbase import flush_database_updates
1410
117
    >>> login('foo.bar@canonical.com')
117
    >>> login('foo.bar@canonical.com')
1411
118
    >>> from zope.component import getUtility
118
    >>> from zope.component import getUtility
1414
119
    >>> from canonical.launchpad.interfaces import (
119
    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
1415
120
    ...     ILaunchBag, IProductSet, License)
120
    >>> from lp.registry.interfaces.product import (
1416
121
    ...     IProductSet,
1417
122
    ...     License,
1418
123
    ...     )
1419
121
    >>> user = getUtility(ILaunchBag).user
124
    >>> user = getUtility(ILaunchBag).user
1420
122
    >>> getUtility(IProductSet).createProduct(
125
    >>> getUtility(IProductSet).createProduct(
1421
123
    ...     user, 'bad-displayname',
126
    ...     user, 'bad-displayname',
1422
124
127
1423
=== modified file 'lib/canonical/launchpad/pagetests/oauth/access-token.txt'
1424
--- lib/canonical/launchpad/pagetests/oauth/access-token.txt	2010-10-03 15:30:06 +0000
1425
+++ lib/canonical/launchpad/pagetests/oauth/access-token.txt	2010-10-21 19:08:55 +0000
1426
@@ -5,10 +5,11 @@
1427
5
access token.
5
access token.
1428
6
6
1429
7
    # First we create a new request token and review it.
7
    # First we create a new request token and review it.
1430
8
    >>> from zope.component import getUtility
1431
9
    >>> from canonical.launchpad.interfaces.oauth import IOAuthConsumerSet
1432
8
    >>> from canonical.launchpad.webapp.interfaces import OAuthPermission
10
    >>> from canonical.launchpad.webapp.interfaces import OAuthPermission
1436
9
    >>> from canonical.launchpad.interfaces import (
11
    >>> from lp.registry.interfaces.person import IPersonSet
1437
10
    ...     IOAuthConsumerSet, IPersonSet, IProductSet)
12
    >>> from lp.registry.interfaces.product import IProductSet
1435
11
    >>> from zope.component import getUtility
1438
12
    >>> from canonical.launchpad.ftests import login, logout
13
    >>> from canonical.launchpad.ftests import login, logout
1439
13
    >>> login('salgado@ubuntu.com')
14
    >>> login('salgado@ubuntu.com')
1440
14
    >>> consumer = getUtility(IOAuthConsumerSet).getByKey('foobar123451432')
15
    >>> consumer = getUtility(IOAuthConsumerSet).getByKey('foobar123451432')
1441
15
16
1442
=== modified file 'lib/canonical/launchpad/pagetests/oauth/authorize-token.txt'
1443
--- lib/canonical/launchpad/pagetests/oauth/authorize-token.txt	2010-10-18 10:11:04 +0000
1444
+++ lib/canonical/launchpad/pagetests/oauth/authorize-token.txt	2010-10-21 19:08:55 +0000
1445
@@ -4,14 +4,21 @@
1446
4
Launchpad's +authorize-token page in order for the user to authenticate
4
Launchpad's +authorize-token page in order for the user to authenticate
1447
5
and authorize or not the consumer to act on his behalf.
5
and authorize or not the consumer to act on his behalf.
1448
6
6
1449
7
    >>> def request_token_for(consumer):
1450
8
    ...     """Helper method to create a request token."""
1451
9
    ...     login('salgado@ubuntu.com')
1452
10
    ...     token = consumer.newRequestToken()
1453
11
    ...     logout()
1454
12
    ...     return token
1455
13
1456
7
    # Create a new request token.
14
    # Create a new request token.
1457
15
    >>> from zope.component import getUtility
1458
8
    >>> from canonical.launchpad.interfaces.oauth import IOAuthConsumerSet
16
    >>> from canonical.launchpad.interfaces.oauth import IOAuthConsumerSet
1459
9
    >>> from zope.component import getUtility
1460
10
    >>> from canonical.launchpad.ftests import ANONYMOUS, login, logout
17
    >>> from canonical.launchpad.ftests import ANONYMOUS, login, logout
1461
11
    >>> login('salgado@ubuntu.com')
18
    >>> login('salgado@ubuntu.com')
1462
12
    >>> consumer = getUtility(IOAuthConsumerSet).getByKey('foobar123451432')
19
    >>> consumer = getUtility(IOAuthConsumerSet).getByKey('foobar123451432')
1463
13
    >>> token = consumer.newRequestToken()
1464
14
    >>> logout()
20
    >>> logout()
1465
21
    >>> token = request_token_for(consumer)
1466
15
22
1467
16
According to the OAuth Core 1.0 spec, the request to the service
23
According to the OAuth Core 1.0 spec, the request to the service
1468
17
provider's user authorization URL (+authorize-token in our case) must
24
provider's user authorization URL (+authorize-token in our case) must
1469
@@ -71,10 +78,13 @@
1470
71
that isn't enough for the application. The user always has the option
78
that isn't enough for the application. The user always has the option
1471
72
to deny permission altogether.
79
to deny permission altogether.
1472
73
80
1474
74
    >>> def authorize_token_main_content(allow_permission):
81
    >>> def authorize_token_browser(allow_permission):
1475
75
    ...     browser.open(
82
    ...     browser.open(
1476
76
    ...         "http://launchpad.dev/+authorize-token?%s&%s"
83
    ...         "http://launchpad.dev/+authorize-token?%s&%s"
1477
77
    ...         % (urlencode(params), allow_permission))
84
    ...         % (urlencode(params), allow_permission))
1478
85
1479
86
    >>> def authorize_token_main_content(allow_permission):
1480
87
    ...     authorize_token_browser(allow_permission)
1481
78
    ...     return find_tag_by_id(browser.contents, 'maincontent')
88
    ...     return find_tag_by_id(browser.contents, 'maincontent')
1482
79
89
1483
80
    >>> def print_access_levels_for(allow_permission):
90
    >>> def print_access_levels_for(allow_permission):
1484
@@ -196,10 +206,7 @@
1485
196
+authorized-token.
206
+authorized-token.
1486
197
207
1487
198
    # Create a new (unreviewed) token.
208
    # Create a new (unreviewed) token.
1492
199
    >>> logout()
209
    >>> token = request_token_for(consumer)
1489
200
    >>> login('salgado@ubuntu.com')
1490
201
    >>> token = consumer.newRequestToken()
1491
202
    >>> logout()
1493
203
210
1494
204
    >>> params = dict(oauth_token=token.key)
211
    >>> params = dict(oauth_token=token.key)
1495
205
    >>> browser.open(
212
    >>> browser.open(
1496
@@ -268,14 +275,15 @@
1497
268
The desktop integration option is only available for OAuth consumers
275
The desktop integration option is only available for OAuth consumers
1498
269
that say what kind of desktop they are (eg. Ubuntu) and give a name
276
that say what kind of desktop they are (eg. Ubuntu) and give a name
1499
270
that a user can identify with their computer (eg. the hostname). Here,
277
that a user can identify with their computer (eg. the hostname). Here,
1501
271
we'll create such a token.
278
we'll create such a consumer, and then a request token for that consumer.
1502
272
279
1507
273
    >>> login('salgado@ubuntu.com')
280
    >>> login('foo.bar@canonical.com')
1508
274
    >>> desktop_key = "System-wide: Ubuntu desktop (mycomputer)"
281
    >>> consumer = factory.makeOAuthConsumer(
1509
275
    >>> consumer = getUtility(IOAuthConsumerSet).new(desktop_key)
282
    ...     "System-wide: Ubuntu desktop (mycomputer)")
1506
276
    >>> token = consumer.newRequestToken()
1510
277
    >>> logout()
283
    >>> logout()
1511
278
284
1512
285
    >>> token = request_token_for(consumer)
1513
286
1514
279
When a desktop tries to integrate with Launchpad, the user gets a
287
When a desktop tries to integrate with Launchpad, the user gets a
1515
280
special warning about giving access to every program running on their
288
special warning about giving access to every program running on their
1516
281
desktop.
289
desktop.
1517
@@ -284,34 +292,42 @@
1518
284
    >>> print extract_text(
292
    >>> print extract_text(
1519
285
    ...     authorize_token_main_content(
293
    ...     authorize_token_main_content(
1520
286
    ...         'allow_permission=DESKTOP_INTEGRATION'))
294
    ...         'allow_permission=DESKTOP_INTEGRATION'))
1522
287
    Integrating mycomputer into your Launchpad account
295
    Confirm Computer Access
1523
288
    The Ubuntu desktop called mycomputer wants access to your
296
    The Ubuntu desktop called mycomputer wants access to your
1527
289
    Launchpad account. If you allow the integration, all applications
297
    Launchpad account. If you allow this, every application running on
1528
290
    running on mycomputer will have read-write access to your
298
    mycomputer will have read-write access to your Launchpad account,
1529
291
    Launchpad account, including to your private data.
299
    including to your private data.
1530
292
    If you're using a public computer, if mycomputer is not the
300
    If you're using a public computer, if mycomputer is not the
1531
293
    computer you're using right now, or if something just doesn't feel
301
    computer you're using right now, or if something just doesn't feel
1537
294
    right about this situation, you should choose "No, thanks, I don't
302
    right about this situation, you should choose "Do Not Allow
1538
295
    trust 'mycomputer'", or close this window now. You can always try
303
    'mycomputer' to Access my Launchpad Account", or close this window
1539
296
    again later.
304
    now. You can always try again later.
1540
297
    Even if you decide to allow the integration, you can change your
305
    Even if you decide to give mycomputer access to your Launchpad
1541
298
    mind later.
306
    account, you can change your mind later.
1542
307
    Allow mycomputer to access my Launchpad account:
1543
308
    or
1544
299
    See all applications authorized to access Launchpad on your behalf.
309
    See all applications authorized to access Launchpad on your behalf.
1545
300
310
1546
301
1547
302
The only time the 'Desktop Integration' permission shows up in the
311
The only time the 'Desktop Integration' permission shows up in the
1548
303
list of permissions is if the client specifically requests it, and no
312
list of permissions is if the client specifically requests it, and no
1549
304
other permission. (Also requesting UNAUTHORIZED is okay--it will show
313
other permission. (Also requesting UNAUTHORIZED is okay--it will show
1550
305
up anyway.)
314
up anyway.)
1551
306
315
1555
307
    >>> print_access_levels_for('allow_permission=DESKTOP_INTEGRATION')
316
    >>> allow_desktop = 'allow_permission=DESKTOP_INTEGRATION'
1556
308
    Give all programs running on "mycomputer" access to my Launchpad account.
317
    >>> print_access_levels_for(allow_desktop)
1557
309
    No, thanks, I don't trust "mycomputer".
318
    Until I Disable It
1558
319
    For One Hour
1559
320
    For One Day
1560
321
    For One Week
1561
322
    Do Not Allow "mycomputer" to Access my Launchpad Account.
1562
310
323
1563
311
    >>> print_access_levels_for(
324
    >>> print_access_levels_for(
1564
312
    ...     'allow_permission=DESKTOP_INTEGRATION&allow_permission=UNAUTHORIZED')
325
    ...     'allow_permission=DESKTOP_INTEGRATION&allow_permission=UNAUTHORIZED')
1567
313
    Give all programs running on "mycomputer" access to my Launchpad account.
326
    Until I Disable It
1568
314
    No, thanks, I don't trust "mycomputer".
327
    For One Hour
1569
328
    For One Day
1570
329
    For One Week
1571
330
    Do Not Allow "mycomputer" to Access my Launchpad Account.
1572
315
331
1573
316
A desktop may not request a level of access other than
332
A desktop may not request a level of access other than
1574
317
DESKTOP_INTEGRATION, since the whole point is to have a permission
333
DESKTOP_INTEGRATION, since the whole point is to have a permission
1575
@@ -324,7 +340,7 @@
1576
324
    ("Change Anything") not supported for desktop-wide use.
340
    ("Change Anything") not supported for desktop-wide use.
1577
325
341
1578
326
    >>> print_access_levels_for(
342
    >>> print_access_levels_for(
1580
327
    ...     'allow_permission=WRITE_PUBLIC&allow_permission=DESKTOP_INTEGRATION')
343
    ...     'allow_permission=WRITE_PUBLIC&' + allow_desktop)
1581
328
    Traceback (most recent call last):
344
    Traceback (most recent call last):
1582
329
    ...
345
    ...
1583
330
    Unauthorized: Desktop integration token requested a permission
346
    Unauthorized: Desktop integration token requested a permission
1584
@@ -335,7 +351,7 @@
1585
335
websites into Launchpad.
351
websites into Launchpad.
1586
336
352
1587
337
    >>> params['oauth_callback'] = 'http://launchpad.dev/bzr'
353
    >>> params['oauth_callback'] = 'http://launchpad.dev/bzr'
1589
338
    >>> print_access_levels_for('allow_permission=DESKTOP_INTEGRATION')
354
    >>> print_access_levels_for(allow_desktop)
1590
339
    Traceback (most recent call last):
355
    Traceback (most recent call last):
1591
340
    ...
356
    ...
1592
341
    Unauthorized: A desktop integration may not specify an OAuth
357
    Unauthorized: A desktop integration may not specify an OAuth
1593
@@ -349,3 +365,126 @@
1594
349
    ...
365
    ...
1595
350
    Unauthorized: A desktop integration may not specify an OAuth
366
    Unauthorized: A desktop integration may not specify an OAuth
1596
351
    callback URL.
367
    callback URL.
1597
368
1598
369
    >>> del params['oauth_callback']
1599
370
1600
371
Accepting full integration
1601
372
--------------------------
1602
373
1603
374
Now let's create a helper function to go through the entire desktop
1604
375
integration process, given the name of the desktop and the level of
1605
376
integration desired.
1606
377
1607
378
    >>> def integrate_desktop(button_to_click):
1608
379
    ...     """Authorize (or don't) a desktop integration request token.
1609
380
    ...     The token is authorized for the computer "mycomputer".
1610
381
    ...
1611
382
    ...     :return: the IOAuthRequestToken, possibly authorized.
1612
383
    ...     """
1613
384
    ...     token = request_token_for(consumer)
1614
385
    ...     params['oauth_token'] = token.key
1615
386
    ...     authorize_token_browser(allow_desktop)
1616
387
    ...     button = browser.getControl(button_to_click)
1617
388
    ...     button.click()
1618
389
    ...     return token
1619
390
1620
391
If the client chooses a permanent desktop integration, the request
1621
392
token is approved and has no expiration date.
1622
393
1623
394
    >>> token = integrate_desktop("Until I Disable It")
1624
395
    >>> print extract_text(find_tag_by_id(browser.contents, 'maincontent'))
1625
396
    Almost finished ...
1626
397
    The Ubuntu desktop called mycomputer now has access to your
1627
398
    Launchpad account. Within a few seconds, you should be able to
1628
399
    start using its Launchpad integration features.
1629
400
1630
401
    >>> print token.is_reviewed
1631
402
    True
1632
403
    >>> print token.permission.name
1633
404
    DESKTOP_INTEGRATION
1634
405
    >>> print token.date_expires
1635
406
    None
1636
407
1637
408
Accepting time-limited integration
1638
409
----------------------------------
1639
410
1640
411
If you allow integration for a limited time, the request token is
1641
412
reviewed and given an expiration date. Here, we authorize a token for
1642
413
one hour.
1643
414
1644
415
    >>> token = integrate_desktop("For One Hour")
1645
416
1646
417
    >>> print extract_text(find_tag_by_id(browser.contents, 'maincontent'))
1647
418
    Almost finished ...
1648
419
    The Ubuntu desktop called mycomputer now has access to your
1649
420
    Launchpad account. Within a few seconds, you should be able to
1650
421
    start using its Launchpad integration features.
1651
422
    The integration you just authorized will expire in 59 minutes. At
1652
423
    that time, you'll have to re-authorize the Ubuntu desktop called
1653
424
    mycomputer, if you want to keep using its Launchpad integration
1654
425
    features.
1655
426
1656
427
    >>> print token.is_reviewed
1657
428
    True
1658
429
    >>> print token.permission.name
1659
430
    DESKTOP_INTEGRATION
1660
431
    >>> token.date_expires is None
1661
432
    False
1662
433
1663
434
Note that a single computer (in this case "mycomputer") may have more
1664
435
than one desktop integration token. This is because there's no way to
1665
436
know that a user hasn't given more than one computer the same name
1666
437
(eg. "ubuntu" or "localhost"). The assignment of computer names to
1667
438
integration tokens is a useful convention, not something we try to
1668
439
enforce.
1669
440
1670
441
Here we authorize a token for one day.
1671
442
1672
443
    >>> token = integrate_desktop("For One Day")
1673
444
1674
445
    >>> print extract_text(find_tag_by_id(browser.contents, 'maincontent'))
1675
446
    Almost finished ...
1676
447
    The integration you just authorized will expire in 23 hours.
1677
448
    ...
1678
449
1679
450
    >>> print token.is_reviewed
1680
451
    True
1681
452
    >>> token.date_expires is None
1682
453
    False
1683
454
1684
455
Here, we authorize a token for a week. The expiration time is given as
1685
456
a date.
1686
457
1687
458
    >>> token = integrate_desktop("For One Week")
1688
459
1689
460
    >>> print extract_text(find_tag_by_id(browser.contents, 'maincontent'))
1690
461
    Almost finished ...
1691
462
    The integration you just authorized will expire 2...
1692
463
    ...
1693
464
1694
465
    >>> print token.is_reviewed
1695
466
    True
1696
467
    >>> print token.permission.name
1697
468
    DESKTOP_INTEGRATION
1698
469
    >>> token.date_expires is None
1699
470
    False
1700
471
1701
472
Declining integration
1702
473
---------------------
1703
474
1704
475
If the client declines integration, the request token is reviewed but
1705
476
cannot be exchanged for an access token.
1706
477
1707
478
    >>> token = integrate_desktop(
1708
479
    ...     """Do Not Allow "mycomputer" to Access my Launchpad Account.""")
1709
480
1710
481
    >>> print extract_text(find_tag_by_id(browser.contents, 'maincontent'))
1711
482
    You decided against desktop integration
1712
483
    You decided not to give the Ubuntu desktop called mycomputer
1713
484
    access to your Launchpad account. You can always change your mind
1714
485
    later.
1715
486
1716
487
    >>> print token.is_reviewed
1717
488
    True
1718
489
    >>> print token.permission.name
1719
490
    UNAUTHORIZED
1720
352
491
1721
=== modified file 'lib/canonical/launchpad/pagetests/oauth/managing-tokens.txt'
1722
--- lib/canonical/launchpad/pagetests/oauth/managing-tokens.txt	2010-10-03 15:30:06 +0000
1723
+++ lib/canonical/launchpad/pagetests/oauth/managing-tokens.txt	2010-10-21 19:08:55 +0000
1724
@@ -5,9 +5,10 @@
1725
5
5
1726
6
    # Create a request token, but don't convert it to an access token.
6
    # Create a request token, but don't convert it to an access token.
1727
7
    >>> from zope.component import getUtility
7
    >>> from zope.component import getUtility
1728
8
    >>> from canonical.launchpad.interfaces.oauth import IOAuthConsumerSet
1729
8
    >>> from canonical.launchpad.webapp.interfaces import OAuthPermission
9
    >>> from canonical.launchpad.webapp.interfaces import OAuthPermission
1732
9
    >>> from canonical.launchpad.interfaces import (
10
    >>> from lp.registry.interfaces.person import IPersonSet
1733
10
    ...     IOAuthConsumerSet, IPersonSet, IProductSet)
11
    >>> from lp.registry.interfaces.product import IProductSet
1734
11
    >>> login('salgado@ubuntu.com')
12
    >>> login('salgado@ubuntu.com')
1735
12
    >>> token = getUtility(IOAuthConsumerSet).getByKey(
13
    >>> token = getUtility(IOAuthConsumerSet).getByKey(
1736
13
    ...     'foobar123451432').newRequestToken()
14
    ...     'foobar123451432').newRequestToken()
1737
14
15
1738
=== modified file 'lib/canonical/launchpad/pagetests/standalone/xx-opstats.txt'
1739
--- lib/canonical/launchpad/pagetests/standalone/xx-opstats.txt	2010-10-09 16:36:22 +0000
1740
+++ lib/canonical/launchpad/pagetests/standalone/xx-opstats.txt	2010-10-21 19:08:55 +0000
1741
@@ -261,8 +261,8 @@
1742
261
261
1743
262
But our database connections are broken.
262
But our database connections are broken.
1744
263
263
1745
264
    >>> from canonical.launchpad.interfaces.lpstorm import IStore
1746
264
    >>> from lp.registry.model.person import Person
265
    >>> from lp.registry.model.person import Person
1747
265
    >>> from canonical.launchpad.interfaces.lpstorm import IStore
1748
266
    >>> IStore(Person).find(Person, name='janitor')
266
    >>> IStore(Person).find(Person, name='janitor')
1749
267
    Traceback (most recent call last):
267
    Traceback (most recent call last):
1750
268
    ...
268
    ...
1751
269
269
1752
=== modified file 'lib/canonical/launchpad/pagetests/standalone/xx-request-expired.txt'
1753
--- lib/canonical/launchpad/pagetests/standalone/xx-request-expired.txt	2010-07-05 19:25:14 +0000
1754
+++ lib/canonical/launchpad/pagetests/standalone/xx-request-expired.txt	2010-10-21 19:08:55 +0000
1755
@@ -6,9 +6,9 @@
1756
6
slightly longer then the soft_request_timeout value to generate, thus
6
slightly longer then the soft_request_timeout value to generate, thus
1757
7
causing a soft timeout to be logged.
7
causing a soft timeout to be logged.
1758
8
8
1759
9
    >>> from textwrap import dedent
1760
10
    >>> from canonical.config import config
9
    >>> from canonical.config import config
1761
11
    >>> from canonical.launchpad.webapp.errorlog import globalErrorUtility
10
    >>> from canonical.launchpad.webapp.errorlog import globalErrorUtility
1762
11
    >>> from textwrap import dedent
1763
12
    >>> old_lastid = globalErrorUtility.getLastOopsReport().id
12
    >>> old_lastid = globalErrorUtility.getLastOopsReport().id
1764
13
    >>> test_data = dedent("""
13
    >>> test_data = dedent("""
1765
14
    ...     [database]
14
    ...     [database]
1766
15
15
1767
=== modified file 'lib/canonical/launchpad/pagetests/standalone/xx-soft-timeout.txt'
1768
--- lib/canonical/launchpad/pagetests/standalone/xx-soft-timeout.txt	2010-07-05 19:25:14 +0000
1769
+++ lib/canonical/launchpad/pagetests/standalone/xx-soft-timeout.txt	2010-10-21 19:08:55 +0000
1770
@@ -39,8 +39,8 @@
1771
39
slightly longer then the soft_request_timeout value to generate, thus
39
slightly longer then the soft_request_timeout value to generate, thus
1772
40
causing a soft timeout to be logged.
40
causing a soft timeout to be logged.
1773
41
41
1774
42
    >>> from canonical.launchpad.webapp.errorlog import globalErrorUtility
1775
42
    >>> from textwrap import dedent
43
    >>> from textwrap import dedent
1776
43
    >>> from canonical.launchpad.webapp.errorlog import globalErrorUtility
1777
44
    >>> old_lastid = globalErrorUtility.getLastOopsReport().id
44
    >>> old_lastid = globalErrorUtility.getLastOopsReport().id
1778
45
    >>> test_data = (dedent("""
45
    >>> test_data = (dedent("""
1779
46
    ...     [database]
46
    ...     [database]
1780
47
47
1781
=== modified file 'lib/canonical/launchpad/pagetests/webservice/xx-service.txt'
1782
--- lib/canonical/launchpad/pagetests/webservice/xx-service.txt	2010-10-09 16:36:22 +0000
1783
+++ lib/canonical/launchpad/pagetests/webservice/xx-service.txt	2010-10-21 19:08:55 +0000
1784
@@ -45,8 +45,8 @@
1785
45
    >>> config.push('beta_data', beta_data)
45
    >>> config.push('beta_data', beta_data)
1786
46
46
1787
47
    >>> from lp.testing import ANONYMOUS, login, logout
47
    >>> from lp.testing import ANONYMOUS, login, logout
1788
48
    >>> from zope.component import getUtility
1789
48
    >>> from canonical.launchpad.testing.pages import webservice_for_person
49
    >>> from canonical.launchpad.testing.pages import webservice_for_person
1790
49
    >>> from zope.component import getUtility
1791
50
    >>> from lp.registry.interfaces.person import IPersonSet
50
    >>> from lp.registry.interfaces.person import IPersonSet
1792
51
    >>> login(ANONYMOUS)
51
    >>> login(ANONYMOUS)
1793
52
    >>> beta_admin = getUtility(IPersonSet).getByEmail(
52
    >>> beta_admin = getUtility(IPersonSet).getByEmail(
1794
53
53
1795
=== modified file 'lib/canonical/launchpad/pagetests/webservice/xx-wadl.txt'
1796
--- lib/canonical/launchpad/pagetests/webservice/xx-wadl.txt	2010-03-29 14:30:51 +0000
1797
+++ lib/canonical/launchpad/pagetests/webservice/xx-wadl.txt	2010-10-21 19:08:55 +0000
1798
@@ -61,8 +61,8 @@
1799
61
61
1800
62
Unlike the test strings we used earlier, this is a valid WADL file.
62
Unlike the test strings we used earlier, this is a valid WADL file.
1801
63
63
1802
64
    >>> from canonical.lazr.xml import XMLValidator
1803
64
    >>> from lazr.restful import WADL_SCHEMA_FILE
65
    >>> from lazr.restful import WADL_SCHEMA_FILE
1804
65
    >>> from canonical.lazr.xml import XMLValidator
1805
66
    >>> wadl_schema = XMLValidator(WADL_SCHEMA_FILE)
66
    >>> wadl_schema = XMLValidator(WADL_SCHEMA_FILE)
1806
67
67
1807
68
    # We need to replace the nbsp entity, because the validator
68
    # We need to replace the nbsp entity, because the validator
1808
69
69
1809
=== modified file 'lib/canonical/launchpad/templates/oauth-authorize.pt'
1810
--- lib/canonical/launchpad/templates/oauth-authorize.pt	2010-10-05 16:06:02 +0000
1811
+++ lib/canonical/launchpad/templates/oauth-authorize.pt	2010-10-21 19:08:55 +0000
1812
@@ -23,17 +23,14 @@
1813
23
          <div metal:fill-slot="extra_top">
23
          <div metal:fill-slot="extra_top">
1814
24
24
1815
25
           <tal:desktop-integration-token condition="token/consumer/is_integrated_desktop">
25
           <tal:desktop-integration-token condition="token/consumer/is_integrated_desktop">
1820
26
             <h1>Integrating
26
             <h1>Confirm Computer Access</h1>
1817
27
               <tal:hostname replace="structure
1818
28
                token/consumer/integrated_desktop_name" />
1819
29
               into your Launchpad account</h1>
1821
30
             <p>The
27
             <p>The
1822
31
               <tal:desktop replace="structure
28
               <tal:desktop replace="structure
1823
32
               token/consumer/integrated_desktop_type" />
29
               token/consumer/integrated_desktop_type" />
1824
33
             called
30
             called
1825
34
             <strong tal:content="token/consumer/integrated_desktop_name">hostname</strong>
31
             <strong tal:content="token/consumer/integrated_desktop_name">hostname</strong>
1828
35
             wants access to your Launchpad account. If you allow the
32
             wants access to your Launchpad account. If you allow this,
1829
36
             integration, all applications running
33
             every application running
1830
37
             on <strong tal:content="token/consumer/integrated_desktop_name">hostname</strong>
34
             on <strong tal:content="token/consumer/integrated_desktop_name">hostname</strong>
1831
38
             will have read-write access to your Launchpad account,
35
             will have read-write access to your Launchpad account,
1832
39
             including to your private data.</p>
36
             including to your private data.</p>
1833
@@ -42,14 +39,37 @@
1834
42
             <strong tal:content="token/consumer/integrated_desktop_name">hostname</strong>
39
             <strong tal:content="token/consumer/integrated_desktop_name">hostname</strong>
1835
43
             is not the computer you're using right now, or if
40
             is not the computer you're using right now, or if
1836
44
             something just doesn't feel right about this situation,
41
             something just doesn't feel right about this situation,
1838
45
             you should choose "No, thanks, I don't trust
42
             you should choose "Do Not Allow
1839
46
             '<tal:hostname replace="structure
43
             '<tal:hostname replace="structure
1846
47
              token/consumer/integrated_desktop_name" />'",
44
               token/consumer/integrated_desktop_name" />' to Access
1847
48
             or close this window now. You can always try
45
             my Launchpad Account", or close this window now. You can
1848
49
             again later.</p>
46
             always try again later.</p>
1849
50
47
1850
51
             <p>Even if you decide to allow the integration, you can
48
             <p>Even if you decide to give
1851
52
             change your mind later.</p>
49
             <strong tal:content="token/consumer/integrated_desktop_name">hostname</strong>
1852
50
             access to your Launchpad account, you can change your
1853
51
             mind later.</p>
1854
52
1855
53
             <p>
1856
54
               Allow <strong tal:content="token/consumer/integrated_desktop_name">hostname</strong>
1857
55
               to access my Launchpad account:
1858
56
             </p>
1859
57
             <p class="subordinate">
1860
58
               <tal:actions
1861
59
                  repeat="action view/visible_desktop_integration_actions">
1862
60
                 <input tal:replace="structure action/render" />
1863
61
               </tal:actions>
1864
62
             </p>
1865
63
1866
64
            <p>or</p>
1867
65
            <p class="subordinate">
1868
66
              <input
1869
67
                 tal:replace="structure view/unauthorized_action/render" />
1870
68
            </p>
1871
69
1872
70
            <input type="hidden" name="allow_permission"
1873
71
              value="DESKTOP_INTEGRATION" />
1874
72
1875
53
           </tal:desktop-integration-token>
73
           </tal:desktop-integration-token>
1876
54
74
1877
55
           <tal:web-integration-token condition="not:token/consumer/is_integrated_desktop">
75
           <tal:web-integration-token condition="not:token/consumer/is_integrated_desktop">
1878
@@ -67,29 +87,29 @@
1879
67
               </tal:has-context>
87
               </tal:has-context>
1880
68
               Launchpad on your behalf. What level of access
88
               Launchpad on your behalf. What level of access
1881
69
               do you want to grant?</p>
89
               do you want to grant?</p>
1882
90
1883
91
            <table>
1884
92
              <tr tal:repeat="action view/visible_actions">
1885
93
                <td style="text-align: right">
1886
94
                  <tal:action replace="structure action/render" />
1887
95
                  <input type="hidden" name="allow_permission"
1888
96
                   tal:attributes="value action/permission/name" />
1889
97
                </td>
1890
98
1891
99
                <td>
1892
100
                  <span class="lesser"
1893
101
                    tal:content="action/permission/description" />
1894
102
                </td>
1895
103
              </tr>
1896
104
            </table>
1897
70
           </tal:web-integration-token>
105
           </tal:web-integration-token>
1898
71
1899
72
           <table>
1900
73
             <tr tal:repeat="action view/visible_actions">
1901
74
               <td style="text-align: right">
1902
75
                 <tal:action replace="structure action/render" />
1903
76
               </td>
1904
77
1905
78
               <tal:web-integration-token
1906
79
                  condition="not:token/consumer/is_integrated_desktop">
1907
80
                 <td>
1908
81
                   <span class="lesser"
1909
82
                     tal:content="action/permission/description" />
1910
83
                 </td>
1911
84
               </tal:web-integration-token>
1912
85
             </tr>
1913
86
           </table>
1914
87
          </div>
106
          </div>
1915
88
107
1916
89
          <div metal:fill-slot="extra_bottom">
108
          <div metal:fill-slot="extra_bottom">
1917
90
            <input type="hidden" name="oauth_token"
109
            <input type="hidden" name="oauth_token"
1918
91
                   tal:condition="request/form/oauth_token|nothing"
110
                   tal:condition="request/form/oauth_token|nothing"
1919
92
                   tal:attributes="value request/form/oauth_token" />
111
                   tal:attributes="value request/form/oauth_token" />
1920
112
1921
93
            <input type="hidden" name="oauth_callback"
113
            <input type="hidden" name="oauth_callback"
1922
94
                   tal:condition="request/form/oauth_callback|nothing"
114
                   tal:condition="request/form/oauth_callback|nothing"
1923
95
                   tal:attributes="value request/form/oauth_callback" />
115
                   tal:attributes="value request/form/oauth_callback" />
1924
96
116
1925
=== modified file 'lib/canonical/launchpad/templates/token-authorized.pt'
1926
--- lib/canonical/launchpad/templates/token-authorized.pt	2009-07-17 17:59:07 +0000
1927
+++ lib/canonical/launchpad/templates/token-authorized.pt	2010-10-21 19:08:55 +0000
1928
@@ -8,25 +8,71 @@
1929
8
>
8
>
1930
9
<body>
9
<body>
1931
10
  <div class="top-portlet" metal:fill-slot="main">
10
  <div class="top-portlet" metal:fill-slot="main">
1944
11
    <tal:unauthorized condition="view/token/permission/enumvalue:UNAUTHORIZED">
11
1945
12
      <h1>Access not granted to application</h1>
12
    <tal:desktop condition="view/token/consumer/is_integrated_desktop">
1946
13
      <p>
13
1947
14
        The application identified as
14
      <tal:unauthorized condition="view/token/permission/enumvalue:UNAUTHORIZED">
1948
15
        <strong tal:content="view/token/consumer/key">key</strong> has not
15
        <h1>You decided against desktop integration</h1>
1949
16
        been given access to your protected resources on Launchpad.
16
1950
17
      </p>
17
        <p>
1951
18
    </tal:unauthorized>
18
          You decided not to give the
1952
19
19
          <tal:desktop replace="structure view/token/consumer/integrated_desktop_type" />
1953
20
    <tal:authorized condition="not:view/token/permission/enumvalue:UNAUTHORIZED">
20
          called
1954
21
      <h1>Almost finished ...</h1>
21
          <strong tal:content="view/token/consumer/integrated_desktop_name">hostname</strong>
1955
22
      <p>
22
          access to your Launchpad account. You can always change your
1956
23
          mind later.
1957
24
        </p>
1958
25
      </tal:unauthorized>
1959
26
1960
27
      <tal:authorized condition="not:view/token/permission/enumvalue:UNAUTHORIZED">
1961
28
        <h1>Almost finished ...</h1>
1962
29
1963
30
        <p>The
1964
31
          <tal:desktop replace="structure view/token/consumer/integrated_desktop_type" />
1965
32
          called
1966
33
          <strong tal:content="view/token/consumer/integrated_desktop_name">hostname</strong>
1967
34
          now has access to your Launchpad account. Within a few
1968
35
          seconds, you should be able to start using its Launchpad
1969
36
          integration features.</p>
1970
37
1971
38
        <p tal:condition="view/token/date_expires">
1972
39
          The integration you just authorized will expire
1973
40
          <tal:date
1974
41
           replace="structure view/token/date_expires/fmt:approximatedate" />.
1975
42
          At that time, you'll have to re-authorize the
1976
43
          <tal:desktop replace="structure view/token/consumer/integrated_desktop_type" />
1977
44
          called
1978
45
          <strong tal:content="view/token/consumer/integrated_desktop_name">hostname</strong>,
1979
46
          if you want to keep using its Launchpad integration features.
1980
47
1981
48
        </p>
1982
49
1983
50
      </tal:authorized>
1984
51
    </tal:desktop>
1985
52
1986
53
    <tal:application condition="not:view/token/consumer/is_integrated_desktop">
1987
54
1988
55
     <tal:unauthorized condition="view/token/permission/enumvalue:UNAUTHORIZED">
1989
56
       <h1>Access not granted to application</h1>
1990
57
       <p>
1991
58
         The application identified as
1992
59
         <strong tal:content="view/token/consumer/key">key</strong> has not
1993
60
         been given access to your protected resources on Launchpad.
1994
61
       </p>
1995
62
     </tal:unauthorized>
1996
63
1997
64
     <tal:authorized condition="not:view/token/permission/enumvalue:UNAUTHORIZED">
1998
65
       <h1>Almost finished ...</h1>
1999
66
       <p>
2000
23
        To finish authorizing the application identified as
67
        To finish authorizing the application identified as
2001
24
        <strong tal:content="view/token/consumer/key">key</strong> to access
68
        <strong tal:content="view/token/consumer/key">key</strong> to access
2002
25
        Launchpad on your behalf you should go back to the application window
69
        Launchpad on your behalf you should go back to the application window
2003
26
        in which you started the process and inform it that you have done your
70
        in which you started the process and inform it that you have done your
2004
27
        part of the process.
71
        part of the process.
2007
28
      </p>
72
       </p>
2008
29
    </tal:authorized>
73
     </tal:authorized>
2009
74
2010
75
    </tal:application>
2011
30
  </div>
76
  </div>
2012
31
77
2013
32
</body>
78
</body>
2014
33
79
2015
=== modified file 'lib/canonical/launchpad/webapp/ftests/test_adapter_timeout.txt.disabled'
2016
--- lib/canonical/launchpad/webapp/ftests/test_adapter_timeout.txt.disabled	2009-06-02 08:20:49 +0000
2017
+++ lib/canonical/launchpad/webapp/ftests/test_adapter_timeout.txt.disabled	2010-10-21 19:08:55 +0000
2018
@@ -16,9 +16,9 @@
2019
16
First we create a view that will provoke a TimeoutError, a view for the
16
First we create a view that will provoke a TimeoutError, a view for the
2020
17
exception, and a time machine.
17
exception, and a time machine.
2021
18
18
2022
19
    >>> from zope.publisher.browser import BrowserView
2023
20
    >>> from zope.testbrowser.testing import Browser
2024
19
    >>> from textwrap import dedent
21
    >>> from textwrap import dedent
2025
20
    >>> from zope.testbrowser.testing import Browser
2026
21
    >>> from zope.publisher.browser import BrowserView
2027
22
    >>> from zope.publisher.interfaces.browser import (
22
    >>> from zope.publisher.interfaces.browser import (
2028
23
    ...     IBrowserRequest, IBrowserView, IBrowserPublisher)
23
    ...     IBrowserRequest, IBrowserView, IBrowserPublisher)
2029
24
    >>> from zope.interface import Interface, implements
24
    >>> from zope.interface import Interface, implements
2030
25
25
2031
=== modified file 'lib/canonical/launchpad/webapp/tests/test_preferredcharsets.txt'
2032
--- lib/canonical/launchpad/webapp/tests/test_preferredcharsets.txt	2006-07-14 14:45:31 +0000
2033
+++ lib/canonical/launchpad/webapp/tests/test_preferredcharsets.txt	2010-10-21 19:08:55 +0000
2034
@@ -1,8 +1,8 @@
2035
1
We have a custom IUserPreferredCharsets which always returns
1
We have a custom IUserPreferredCharsets which always returns
2036
2
utf-8 as the preferred charset.
2
utf-8 as the preferred charset.
2037
3
3
2038
4
    >>> from zope.publisher.browser import TestRequest
2039
4
    >>> from canonical.launchpad.webapp import Utf8PreferredCharsets
5
    >>> from canonical.launchpad.webapp import Utf8PreferredCharsets
2040
5
    >>> from zope.publisher.browser import TestRequest
2041
6
    >>> user_preferred = Utf8PreferredCharsets(TestRequest())
6
    >>> user_preferred = Utf8PreferredCharsets(TestRequest())
2042
7
7
2043
8
    >>> from zope.i18n.interfaces import IUserPreferredCharsets
8
    >>> from zope.i18n.interfaces import IUserPreferredCharsets
2044
9
9
2045
=== modified file 'lib/canonical/launchpad/webapp/tests/test_request_expire_render.txt'
2046
--- lib/canonical/launchpad/webapp/tests/test_request_expire_render.txt	2010-09-13 04:45:59 +0000
2047
+++ lib/canonical/launchpad/webapp/tests/test_request_expire_render.txt	2010-10-21 19:08:55 +0000
2048
@@ -12,8 +12,8 @@
2049
12
since get_request_remaining_seconds will raise. However, if the user is logged
12
since get_request_remaining_seconds will raise. However, if the user is logged
2050
13
in, a query will be issued to render the "Logged in as No Privileges Person".
13
in, a query will be issued to render the "Logged in as No Privileges Person".
2051
14
14
2052
15
    >>> from canonical.config import config
2053
15
    >>> from textwrap import dedent
16
    >>> from textwrap import dedent
2054
16
    >>> from canonical.config import config
2055
17
    >>> test_data = dedent("""
17
    >>> test_data = dedent("""
2056
18
    ...     [database]
18
    ...     [database]
2057
19
    ...     db_statement_timeout: 10000
19
    ...     db_statement_timeout: 10000
2058
20
20
2059
=== modified file 'lib/canonical/lazr/doc/menus.txt'
2060
--- lib/canonical/lazr/doc/menus.txt	2010-09-28 19:10:51 +0000
2061
+++ lib/canonical/lazr/doc/menus.txt	2010-10-21 19:08:55 +0000
2062
@@ -76,8 +76,8 @@
2063
76
    # objects. This function does most of the work, but views must be
76
    # objects. This function does most of the work, but views must be
2064
77
    # assigned to the _last_obj_traversed attribute.
77
    # assigned to the _last_obj_traversed attribute.
2065
78
78
2066
79
    >>> from canonical.launchpad.webapp import canonical_url
2067
79
    >>> from canonical.lazr.testing.menus import make_fake_request
80
    >>> from canonical.lazr.testing.menus import make_fake_request
2068
80
    >>> from canonical.launchpad.webapp import canonical_url
2069
81
81
2070
82
    >>> root = Root('', None)
82
    >>> root = Root('', None)
2071
83
    >>> cookbook = Cookbook('joy-of-cooking', root)
83
    >>> cookbook = Cookbook('joy-of-cooking', root)
2072
@@ -932,8 +932,8 @@
2073
932
    >>> from zope.traversing.adapters import DefaultTraversable
932
    >>> from zope.traversing.adapters import DefaultTraversable
2074
933
    >>> from zope.traversing.interfaces import IPathAdapter, ITraversable
933
    >>> from zope.traversing.interfaces import IPathAdapter, ITraversable
2075
934
    >>> from canonical.launchpad.ftests import test_tales
934
    >>> from canonical.launchpad.ftests import test_tales
2076
935
    >>> from canonical.lazr.testing.menus import summarise_tal_links
2077
935
    >>> from lp.app.browser.tales import MenuAPI
936
    >>> from lp.app.browser.tales import MenuAPI
2078
936
    >>> from canonical.lazr.testing.menus import summarise_tal_links
2079
937
937
2080
938
    # MenuAPI is normally registered as an IPathAdapter in ZCML. This
938
    # MenuAPI is normally registered as an IPathAdapter in ZCML. This
2081
939
    # approximates what is done by the code:
939
    # approximates what is done by the code:
2082
940
940
2083
=== modified file 'lib/canonical/lazr/doc/timeout.txt'
2084
--- lib/canonical/lazr/doc/timeout.txt	2010-04-22 18:53:09 +0000
2085
+++ lib/canonical/lazr/doc/timeout.txt	2010-10-21 19:08:55 +0000
2086
@@ -10,8 +10,8 @@
2087
10
The time to wait can be passed using the timeout parameter to the
10
The time to wait can be passed using the timeout parameter to the
2088
11
decorator.
11
decorator.
2089
12
12
2090
13
    >>> from canonical.lazr.timeout import with_timeout
2091
13
    >>> from select import select
14
    >>> from select import select
2092
14
    >>> from canonical.lazr.timeout import with_timeout
2093
15
15
2094
16
    >>> @with_timeout(timeout=0.5)
16
    >>> @with_timeout(timeout=0.5)
2095
17
    ... def wait_for(time):
17
    ... def wait_for(time):
2096
18
18
2097
=== modified file 'lib/lp/answers/browser/tests/views.txt'
2098
--- lib/lp/answers/browser/tests/views.txt	2010-07-30 12:56:27 +0000
2099
+++ lib/lp/answers/browser/tests/views.txt	2010-10-21 19:08:55 +0000
2100
@@ -100,8 +100,8 @@
2101
100
100
2102
101
    # Setup a harness to easily test the view.
101
    # Setup a harness to easily test the view.
2103
102
102
2104
103
    >>> from canonical.launchpad.ftests import LaunchpadFormHarness
2105
104
    >>> from canonical.launchpad.browser import QuestionWorkflowView
103
    >>> from canonical.launchpad.browser import QuestionWorkflowView
2106
104
    >>> from canonical.launchpad.ftests import LaunchpadFormHarness
2107
105
    >>> workflow_harness = LaunchpadFormHarness(
105
    >>> workflow_harness = LaunchpadFormHarness(
2108
106
    ...     firefox_question, QuestionWorkflowView)
106
    ...     firefox_question, QuestionWorkflowView)
2109
107
107
2110
@@ -708,8 +708,8 @@
2111
708
retrieve the set of languages in which the user is assumed to be
708
retrieve the set of languages in which the user is assumed to be
2112
709
interested.
709
interested.
2113
710
710
2114
711
    >>> from canonical.launchpad.browser import UserSupportLanguagesMixin
2115
711
    >>> from canonical.launchpad.webapp import LaunchpadView
712
    >>> from canonical.launchpad.webapp import LaunchpadView
2116
712
    >>> from canonical.launchpad.browser import UserSupportLanguagesMixin
2117
713
713
2118
714
    >>> class UserSupportLanguagesView(UserSupportLanguagesMixin,
714
    >>> class UserSupportLanguagesView(UserSupportLanguagesMixin,
2119
715
    ...                                LaunchpadView):
715
    ...                                LaunchpadView):
2120
716
716
2121
=== modified file 'lib/lp/answers/doc/emailinterface.txt.disabled'
2122
--- lib/lp/answers/doc/emailinterface.txt.disabled	2010-10-04 19:50:45 +0000
2123
+++ lib/lp/answers/doc/emailinterface.txt.disabled	2010-10-21 19:08:55 +0000
2124
@@ -98,17 +98,17 @@
2125
98
    # be the question owner and Sample Person who will play the role of
98
    # be the question owner and Sample Person who will play the role of
2126
99
    # answer contact. Foo Bar is used to change the status of the
99
    # answer contact. Foo Bar is used to change the status of the
2127
100
    # question.
100
    # question.
2128
101
    >>> from lp.registry.interfaces.distribution import IDistributionSet
2129
101
    >>> from lp.registry.interfaces.person import IPersonSet
102
    >>> from lp.registry.interfaces.person import IPersonSet
2130
102
    >>> from lp.registry.interfaces.distribution import IDistributionSet
2131
103
    >>> login('no-priv@canonical.com')
103
    >>> login('no-priv@canonical.com')
2132
104
    >>> personset = getUtility(IPersonSet)
104
    >>> personset = getUtility(IPersonSet)
2133
105
    >>> sample_person = personset.getByEmail('test@canonical.com')
105
    >>> sample_person = personset.getByEmail('test@canonical.com')
2134
106
    >>> no_priv = personset.getByEmail('no-priv@canonical.com')
106
    >>> no_priv = personset.getByEmail('no-priv@canonical.com')
2135
107
    >>> foo_bar = personset.getByEmail('foo.bar@canonical.com')
107
    >>> foo_bar = personset.getByEmail('foo.bar@canonical.com')
2136
108
108
2137
109
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
2138
110
    >>> from canonical.config import config
109
    >>> from canonical.config import config
2139
111
    >>> from canonical.database.sqlbase import commit
110
    >>> from canonical.database.sqlbase import commit
2140
111
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
2141
112
112
2142
113
    >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
113
    >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
2143
114
    >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
114
    >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
2144
115
115
2145
=== modified file 'lib/lp/answers/doc/expiration.txt'
2146
--- lib/lp/answers/doc/expiration.txt	2010-07-30 12:56:27 +0000
2147
+++ lib/lp/answers/doc/expiration.txt	2010-10-21 19:08:55 +0000
2148
@@ -19,8 +19,8 @@
2149
19
19
2150
20
    # Sanity check in case somebody modifies the question sampledata and
20
    # Sanity check in case somebody modifies the question sampledata and
2151
21
    # forget to update this script.
21
    # forget to update this script.
2152
22
    >>> from lp.answers.interfaces.questionenums import QuestionStatus
2153
22
    >>> from lp.answers.model.question import Question
23
    >>> from lp.answers.model.question import Question
2154
23
    >>> from lp.answers.interfaces.questionenums import QuestionStatus
2155
24
    >>> Question.select('status IN (%i,%i)' % (
24
    >>> Question.select('status IN (%i,%i)' % (
2156
25
    ...     QuestionStatus.OPEN.value,
25
    ...     QuestionStatus.OPEN.value,
2157
26
    ...     QuestionStatus.NEEDSINFO.value)).count()
26
    ...     QuestionStatus.NEEDSINFO.value)).count()
2158
@@ -43,8 +43,8 @@
2159
43
    >>> two_weeks_ago = now - timedelta(days=14)
43
    >>> two_weeks_ago = now - timedelta(days=14)
2160
44
    >>> a_month_ago = now - timedelta(days=31)
44
    >>> a_month_ago = now - timedelta(days=31)
2161
45
    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
45
    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
2162
46
    >>> from lp.answers.interfaces.questioncollection import IQuestionSet
2163
46
    >>> from lp.registry.interfaces.person import IPersonSet
47
    >>> from lp.registry.interfaces.person import IPersonSet
2164
47
    >>> from lp.answers.interfaces.questioncollection import IQuestionSet
2165
48
    >>> login('no-priv@canonical.com')
48
    >>> login('no-priv@canonical.com')
2166
49
    >>> no_priv = getUtility(ILaunchBag).user
49
    >>> no_priv = getUtility(ILaunchBag).user
2167
50
50
2168
51
51
2169
=== modified file 'lib/lp/answers/doc/faq-vocabulary.txt'
2170
--- lib/lp/answers/doc/faq-vocabulary.txt	2010-08-02 02:33:53 +0000
2171
+++ lib/lp/answers/doc/faq-vocabulary.txt	2010-10-21 19:08:55 +0000
2172
@@ -4,10 +4,10 @@
2173
4
collection. It provides the IHugeVocabulary interface.
4
collection. It provides the IHugeVocabulary interface.
2174
5
5
2175
6
    >>> from zope.component import getUtility
6
    >>> from zope.component import getUtility
2177
7
    >>> from lp.registry.interfaces.product import IProductSet
7
    >>> from zope.schema.vocabulary import getVocabularyRegistry
2178
8
    >>> from canonical.launchpad.webapp.testing import verifyObject
8
    >>> from canonical.launchpad.webapp.testing import verifyObject
2179
9
    >>> from canonical.launchpad.webapp.vocabulary import IHugeVocabulary
9
    >>> from canonical.launchpad.webapp.vocabulary import IHugeVocabulary
2181
10
    >>> from zope.schema.vocabulary import getVocabularyRegistry
10
    >>> from lp.registry.interfaces.product import IProductSet
2182
11
11
2183
12
    >>> vocabulary_registry = getVocabularyRegistry()
12
    >>> vocabulary_registry = getVocabularyRegistry()
2184
13
    >>> firefox = getUtility(IProductSet).getByName('firefox')
13
    >>> firefox = getUtility(IProductSet).getByName('firefox')
2185
14
14
2186
=== modified file 'lib/lp/answers/doc/faq.txt'
2187
--- lib/lp/answers/doc/faq.txt	2010-07-30 12:56:27 +0000
2188
+++ lib/lp/answers/doc/faq.txt	2010-10-21 19:08:55 +0000
2189
@@ -10,12 +10,12 @@
2190
10
are associated to distributions or products. The IFAQTarget interface is
10
are associated to distributions or products. The IFAQTarget interface is
2191
11
provided by objects that can host FAQs.
11
provided by objects that can host FAQs.
2192
12
12
2193
13
    >>> from zope.security.proxy import removeSecurityProxy
2194
13
    >>> from canonical.launchpad.webapp.testing import verifyObject
14
    >>> from canonical.launchpad.webapp.testing import verifyObject
2195
14
    >>> from zope.security.proxy import removeSecurityProxy
2196
15
15
2197
16
    >>> from lp.answers.interfaces.faqtarget import IFAQTarget
2198
16
    >>> from lp.registry.interfaces.distribution import IDistributionSet
17
    >>> from lp.registry.interfaces.distribution import IDistributionSet
2199
17
    >>> from lp.registry.interfaces.product import IProductSet
18
    >>> from lp.registry.interfaces.product import IProductSet
2200
18
    >>> from lp.answers.interfaces.faqtarget import IFAQTarget
2201
19
19
2202
20
    >>> firefox = getUtility(IProductSet).getByName('firefox')
20
    >>> firefox = getUtility(IProductSet).getByName('firefox')
2203
21
21
2204
22
22
2205
=== modified file 'lib/lp/answers/doc/faqtarget.txt'
2206
--- lib/lp/answers/doc/faqtarget.txt	2010-10-03 15:30:06 +0000
2207
+++ lib/lp/answers/doc/faqtarget.txt	2010-10-21 19:08:55 +0000
2208
@@ -31,8 +31,8 @@
2209
31
the target.
31
the target.
2210
32
32
2211
33
    >>> login('no-priv@canonical.com')
33
    >>> login('no-priv@canonical.com')
2212
34
    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
2213
35
    >>> from canonical.launchpad.webapp.authorization import check_permission
34
    >>> from canonical.launchpad.webapp.authorization import check_permission
2214
35
    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
2215
36
    >>> check_permission('launchpad.Append', target)
36
    >>> check_permission('launchpad.Append', target)
2216
37
    False
37
    False
2217
38
38
2218
39
39
2219
=== modified file 'lib/lp/answers/doc/notifications.txt'
2220
--- lib/lp/answers/doc/notifications.txt	2010-07-30 12:56:27 +0000
2221
+++ lib/lp/answers/doc/notifications.txt	2010-10-21 19:08:55 +0000
2222
@@ -83,8 +83,8 @@
2223
83
Register the Ubuntu Team as Ubuntu's answer contact, so that they get
83
Register the Ubuntu Team as Ubuntu's answer contact, so that they get
2224
84
notified about the changes as well:
84
notified about the changes as well:
2225
85
85
2226
86
    >>> from lp.services.worlddata.interfaces.language import ILanguageSet
2227
87
    >>> from lp.registry.interfaces.person import IPersonSet
86
    >>> from lp.registry.interfaces.person import IPersonSet
2228
87
    >>> from lp.services.worlddata.interfaces.language import ILanguageSet
2229
88
    >>> ubuntu_team = getUtility(IPersonSet).getByName('ubuntu-team')
88
    >>> ubuntu_team = getUtility(IPersonSet).getByName('ubuntu-team')
2230
89
    >>> ubuntu_team.addLanguage(getUtility(ILanguageSet)['en'])
89
    >>> ubuntu_team.addLanguage(getUtility(ILanguageSet)['en'])
2231
90
    >>> ubuntu.addAnswerContact(ubuntu_team)
90
    >>> ubuntu.addAnswerContact(ubuntu_team)
2232
@@ -103,9 +103,9 @@
2233
103
If we edit the title and description of the question, a notification
103
If we edit the title and description of the question, a notification
2234
104
will be sent.
104
will be sent.
2235
105
105
2236
106
    >>> from zope.interface import providedBy
2237
106
    >>> from lazr.lifecycle.event import ObjectModifiedEvent
107
    >>> from lazr.lifecycle.event import ObjectModifiedEvent
2238
107
    >>> from lazr.lifecycle.snapshot import Snapshot
108
    >>> from lazr.lifecycle.snapshot import Snapshot
2239
108
    >>> from zope.interface import providedBy
2240
109
109
2241
110
    >>> login('no-priv@canonical.com')
110
    >>> login('no-priv@canonical.com')
2242
111
    >>> no_priv = getUtility(ILaunchBag).user
111
    >>> no_priv = getUtility(ILaunchBag).user
2243
112
112
2244
=== modified file 'lib/lp/answers/doc/person.txt'
2245
--- lib/lp/answers/doc/person.txt	2010-06-09 17:07:49 +0000
2246
+++ lib/lp/answers/doc/person.txt	2010-10-21 19:08:55 +0000
2247
@@ -14,8 +14,8 @@
2248
14
commented on, or answered.  Various subsets can be selected by using the
14
commented on, or answered.  Various subsets can be selected by using the
2249
15
various search criteria.
15
various search criteria.
2250
16
16
2251
17
    >>> from lp.answers.interfaces.questionsperson import IQuestionsPerson
2252
17
    >>> from lp.registry.interfaces.person import IPersonSet
18
    >>> from lp.registry.interfaces.person import IPersonSet
2253
18
    >>> from lp.answers.interfaces.questionsperson import IQuestionsPerson
2254
19
    >>> personset = getUtility(IPersonSet)
19
    >>> personset = getUtility(IPersonSet)
2255
20
    >>> foo_bar_raw = personset.getByEmail('foo.bar@canonical.com')
20
    >>> foo_bar_raw = personset.getByEmail('foo.bar@canonical.com')
2256
21
    >>> foo_bar = IQuestionsPerson(foo_bar_raw)
21
    >>> foo_bar = IQuestionsPerson(foo_bar_raw)
2257
22
22
2258
=== modified file 'lib/lp/answers/doc/projectgroup.txt'
2259
--- lib/lp/answers/doc/projectgroup.txt	2010-07-30 12:56:27 +0000
2260
+++ lib/lp/answers/doc/projectgroup.txt	2010-10-21 19:08:55 +0000
2261
@@ -24,8 +24,8 @@
2262
24
You can search for all questions filed against projects in a project using the
24
You can search for all questions filed against projects in a project using the
2263
25
project group's searchQuestions() method.
25
project group's searchQuestions() method.
2264
26
26
2265
27
    >>> from lp.registry.interfaces.person import IPersonSet
2266
27
    >>> from lp.registry.interfaces.product import IProductSet
28
    >>> from lp.registry.interfaces.product import IProductSet
2267
28
    >>> from lp.registry.interfaces.person import IPersonSet
2268
29
29
2269
30
    >>> login('test@canonical.com')
30
    >>> login('test@canonical.com')
2270
31
    >>> thunderbird = getUtility(IProductSet).getByName('thunderbird')
31
    >>> thunderbird = getUtility(IProductSet).getByName('thunderbird')
2271
32
32
2272
=== modified file 'lib/lp/answers/doc/question.txt'
2273
--- lib/lp/answers/doc/question.txt	2010-10-03 15:30:06 +0000
2274
+++ lib/lp/answers/doc/question.txt	2010-10-21 19:08:55 +0000
2275
@@ -11,9 +11,9 @@
2276
11
    >>> login('test@canonical.com')
11
    >>> login('test@canonical.com')
2277
12
12
2278
13
    >>> from canonical.launchpad.webapp.testing import verifyObject
13
    >>> from canonical.launchpad.webapp.testing import verifyObject
2279
14
    >>> from lp.answers.interfaces.questiontarget import IQuestionTarget
2280
15
    >>> from lp.registry.interfaces.distribution import IDistributionSet
2281
14
    >>> from lp.registry.interfaces.person import IPersonSet
16
    >>> from lp.registry.interfaces.person import IPersonSet
2282
15
    >>> from lp.registry.interfaces.distribution import IDistributionSet
2283
16
    >>> from lp.answers.interfaces.questiontarget import IQuestionTarget
2284
17
    >>> from lp.registry.interfaces.product import IProductSet
17
    >>> from lp.registry.interfaces.product import IProductSet
2285
18
18
2286
19
    >>> firefox = getUtility(IProductSet)['firefox']
19
    >>> firefox = getUtility(IProductSet)['firefox']
2287
@@ -86,8 +86,8 @@
2288
86
86
2289
87
Questions are manipulated through the IQuestion interface.
87
Questions are manipulated through the IQuestion interface.
2290
88
88
2291
89
    >>> from zope.security.proxy import removeSecurityProxy
2292
89
    >>> from lp.answers.interfaces.question import IQuestion
90
    >>> from lp.answers.interfaces.question import IQuestion
2293
90
    >>> from zope.security.proxy import removeSecurityProxy
2294
91
91
2295
92
    # The complete interface is not necessarily available to the
92
    # The complete interface is not necessarily available to the
2296
93
    # logged in user.
93
    # logged in user.
2297
94
94
2298
=== modified file 'lib/lp/answers/doc/questionsets.txt'
2299
--- lib/lp/answers/doc/questionsets.txt	2010-10-03 15:30:06 +0000
2300
+++ lib/lp/answers/doc/questionsets.txt	2010-10-21 19:08:55 +0000
2301
@@ -177,10 +177,10 @@
2302
177
177
2303
178
Then some recent questions are created on a number of projects.
178
Then some recent questions are created on a number of projects.
2304
179
179
2305
180
    >>> from lp.answers.testing import QuestionFactory
2306
180
    >>> from lp.registry.interfaces.distribution import IDistributionSet
181
    >>> from lp.registry.interfaces.distribution import IDistributionSet
2307
181
    >>> from lp.registry.interfaces.person import IPersonSet
182
    >>> from lp.registry.interfaces.person import IPersonSet
2308
182
    >>> from lp.registry.interfaces.product import IProductSet
183
    >>> from lp.registry.interfaces.product import IProductSet
2309
183
    >>> from lp.answers.testing import QuestionFactory
2310
184
184
2311
185
    >>> firefox = getUtility(IProductSet).getByName('firefox')
185
    >>> firefox = getUtility(IProductSet).getByName('firefox')
2312
186
    >>> landscape = getUtility(IProductSet).getByName('landscape')
186
    >>> landscape = getUtility(IProductSet).getByName('landscape')
2313
187
187
2314
=== modified file 'lib/lp/answers/doc/questiontarget.txt'
2315
--- lib/lp/answers/doc/questiontarget.txt	2010-10-03 15:30:06 +0000
2316
+++ lib/lp/answers/doc/questiontarget.txt	2010-10-21 19:08:55 +0000
2317
@@ -532,9 +532,9 @@
2318
532
copied to the question.
532
copied to the question.
2319
533
533
2320
534
    >>> from datetime import datetime
534
    >>> from datetime import datetime
2321
535
    >>> from pytz import UTC
2322
536
    >>> from lp.bugs.interfaces.bug import CreateBugParams
535
    >>> from lp.bugs.interfaces.bug import CreateBugParams
2323
537
    >>> from lp.registry.interfaces.product import IProductSet
536
    >>> from lp.registry.interfaces.product import IProductSet
2324
537
    >>> from pytz import UTC
2325
538
538
2326
539
    >>> now = datetime.now(UTC)
539
    >>> now = datetime.now(UTC)
2327
540
    >>> target = getUtility(IProductSet)['jokosher']
540
    >>> target = getUtility(IProductSet)['jokosher']
2328
541
541
2329
=== modified file 'lib/lp/answers/doc/workflow.txt'
2330
--- lib/lp/answers/doc/workflow.txt	2010-10-03 15:30:06 +0000
2331
+++ lib/lp/answers/doc/workflow.txt	2010-10-21 19:08:55 +0000
2332
@@ -602,8 +602,8 @@
2333
602
    # Register an event listener that will print events it receives.
602
    # Register an event listener that will print events it receives.
2334
603
    >>> from lazr.lifecycle.interfaces import (
603
    >>> from lazr.lifecycle.interfaces import (
2335
604
    ...     IObjectCreatedEvent, IObjectModifiedEvent)
604
    ...     IObjectCreatedEvent, IObjectModifiedEvent)
2336
605
    >>> from canonical.lazr.testing.event import TestEventListener
2337
605
    >>> from lp.answers.interfaces.question import IQuestion
606
    >>> from lp.answers.interfaces.question import IQuestion
2338
606
    >>> from canonical.lazr.testing.event import TestEventListener
2339
607
607
2340
608
    >>> def print_event(object, event):
608
    >>> def print_event(object, event):
2341
609
    ...     print "Received %s on %s" % (
609
    ...     print "Received %s on %s" % (
2342
610
610
2343
=== modified file 'lib/lp/answers/stories/distribution-package-answer-contact.txt'
2344
--- lib/lp/answers/stories/distribution-package-answer-contact.txt	2010-07-30 12:56:27 +0000
2345
+++ lib/lp/answers/stories/distribution-package-answer-contact.txt	2010-10-21 19:08:55 +0000
2346
@@ -7,10 +7,10 @@
2347
7
    # Register a Sample Person as an answer contact for the distribution.
7
    # Register a Sample Person as an answer contact for the distribution.
2348
8
    >>> from zope.component import getUtility
8
    >>> from zope.component import getUtility
2349
9
    >>> from canonical.launchpad.ftests import login, logout
9
    >>> from canonical.launchpad.ftests import login, logout
2350
10
    >>> from canonical.database.sqlbase import flush_database_updates
2351
10
    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
11
    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
2352
12
    >>> from lp.registry.interfaces.distribution import IDistributionSet
2353
11
    >>> from lp.services.worlddata.interfaces.language import ILanguageSet
13
    >>> from lp.services.worlddata.interfaces.language import ILanguageSet
2354
12
    >>> from lp.registry.interfaces.distribution import IDistributionSet
2355
13
    >>> from canonical.database.sqlbase import flush_database_updates
2356
14
    >>> login('test@canonical.com')
14
    >>> login('test@canonical.com')
2357
15
    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
15
    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
2358
16
    >>> # Answer contacts must speak a language
16
    >>> # Answer contacts must speak a language
2359
17
17
2360
=== modified file 'lib/lp/answers/tests/questiontarget-sourcepackage.txt'
2361
--- lib/lp/answers/tests/questiontarget-sourcepackage.txt	2010-07-30 12:56:27 +0000
2362
+++ lib/lp/answers/tests/questiontarget-sourcepackage.txt	2010-10-21 19:08:55 +0000
2363
@@ -13,8 +13,8 @@
2364
13
of the DistributionSourcePackage (and not the SourcePackage):
13
of the DistributionSourcePackage (and not the SourcePackage):
2365
14
14
2366
15
    >>> login('no-priv@canonical.com')
15
    >>> login('no-priv@canonical.com')
2367
16
    >>> from lp.registry.interfaces.distribution import IDistributionSet
2368
16
    >>> from lp.registry.interfaces.person import IPersonSet
17
    >>> from lp.registry.interfaces.person import IPersonSet
2369
17
    >>> from lp.registry.interfaces.distribution import IDistributionSet
2370
18
    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
18
    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
2371
19
    >>> firefox = ubuntu.currentseries.getSourcePackage('mozilla-firefox')
19
    >>> firefox = ubuntu.currentseries.getSourcePackage('mozilla-firefox')
2372
20
20
2373
21
21
2374
=== modified file 'lib/lp/app/browser/tests/base-layout.txt'
2375
--- lib/lp/app/browser/tests/base-layout.txt	2010-09-29 03:26:01 +0000
2376
+++ lib/lp/app/browser/tests/base-layout.txt	2010-10-21 19:08:55 +0000
2377
@@ -10,9 +10,9 @@
2378
10
in the root element of the page template. The base layout template uses the
10
in the root element of the page template. The base layout template uses the
2379
11
YUI grid classes for positioning.
11
YUI grid classes for positioning.
2380
12
12
2381
13
    >>> from z3c.ptcompat import ViewPageTemplateFile
2382
14
    >>> from canonical.launchpad.webapp.publisher import LaunchpadView
13
    >>> from canonical.launchpad.webapp.publisher import LaunchpadView
2383
15
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
14
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
2384
15
    >>> from z3c.ptcompat import ViewPageTemplateFile
2385
16
16
2386
17
    >>> user = factory.makePerson(name='waffles')
17
    >>> user = factory.makePerson(name='waffles')
2387
18
    >>> request = LaunchpadTestRequest(
18
    >>> request = LaunchpadTestRequest(
2388
19
19
2389
=== modified file 'lib/lp/app/browser/tests/launchpadform-view.txt'
2390
--- lib/lp/app/browser/tests/launchpadform-view.txt	2010-06-22 17:12:23 +0000
2391
+++ lib/lp/app/browser/tests/launchpadform-view.txt	2010-10-21 19:08:55 +0000
2392
@@ -6,15 +6,15 @@
2393
6
widget rendering is wrapped with a <div> using the widget_class, which
6
widget rendering is wrapped with a <div> using the widget_class, which
2394
7
can be used for subordinate field indentation, for example.
7
can be used for subordinate field indentation, for example.
2395
8
8
2396
9
    >>> from z3c.ptcompat import ViewPageTemplateFile
2397
10
    >>> from zope.app.form.browser import TextWidget
9
    >>> from zope.app.form.browser import TextWidget
2398
11
    >>> from zope.interface import Interface
10
    >>> from zope.interface import Interface
2399
12
    >>> from zope.schema import TextLine
11
    >>> from zope.schema import TextLine
2400
13
    >>> from canonical.config import config
12
    >>> from canonical.config import config
2401
13
    >>> from z3c.ptcompat import ViewPageTemplateFile
2402
14
    >>> from canonical.launchpad.webapp.launchpadform import (
14
    >>> from canonical.launchpad.webapp.launchpadform import (
2403
15
    ...     custom_widget, LaunchpadFormView)
15
    ...     custom_widget, LaunchpadFormView)
2404
16
    >>> from canonical.launchpad.testing.pages import find_tags_by_class
2405
16
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
17
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
2406
17
    >>> from canonical.launchpad.testing.pages import find_tags_by_class
2407
18
18
2408
19
    >>> class ITestSchema(Interface):
19
    >>> class ITestSchema(Interface):
2409
20
    ...     displayname = TextLine(title=u"Title")
20
    ...     displayname = TextLine(title=u"Title")
2410
21
21
2411
=== modified file 'lib/lp/app/doc/tales.txt'
2412
--- lib/lp/app/doc/tales.txt	2010-10-09 16:36:22 +0000
2413
+++ lib/lp/app/doc/tales.txt	2010-10-21 19:08:55 +0000
2414
@@ -113,8 +113,8 @@
2415
113
113
2416
114
And finally Copy archives.
114
And finally Copy archives.
2417
115
115
2418
116
    >>> from lp.soyuz.enums import ArchivePurpose
2419
116
    >>> from lp.soyuz.interfaces.archive import IArchiveSet
117
    >>> from lp.soyuz.interfaces.archive import IArchiveSet
2420
117
    >>> from lp.soyuz.enums import ArchivePurpose
2421
118
    >>> copy = getUtility(IArchiveSet).new(
118
    >>> copy = getUtility(IArchiveSet).new(
2422
119
    ...     owner=mark, purpose=ArchivePurpose.COPY,
119
    ...     owner=mark, purpose=ArchivePurpose.COPY,
2423
120
    ...     distribution=ubuntu, name='rebuild')
120
    ...     distribution=ubuntu, name='rebuild')
2424
@@ -197,8 +197,8 @@
2425
197
197
2426
198
The 'building' build is 14x14:
198
The 'building' build is 14x14:
2427
199
199
2428
200
    >>> from zope.security.proxy import removeSecurityProxy
2429
200
    >>> from lp.buildmaster.enums import BuildStatus
201
    >>> from lp.buildmaster.enums import BuildStatus
2430
201
    >>> from zope.security.proxy import removeSecurityProxy
2431
202
    >>> removeSecurityProxy(build).status = BuildStatus.BUILDING
202
    >>> removeSecurityProxy(build).status = BuildStatus.BUILDING
2432
203
    >>> print test_tales("build/image:icon", build=build)
203
    >>> print test_tales("build/image:icon", build=build)
2433
204
    <img width="14" height="14"...src="/@@/processing" />
204
    <img width="14" height="14"...src="/@@/processing" />
2434
@@ -1181,8 +1181,8 @@
2435
1181
1181
2436
1182
Test the 'fmt:url' namespace for canonical urls.
1182
Test the 'fmt:url' namespace for canonical urls.
2437
1183
1183
2438
1184
    >>> from zope.interface import implements
2439
1184
    >>> from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
1185
    >>> from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
2440
1185
    >>> from zope.interface import implements
2441
1186
    >>> class ObjectThatHasUrl:
1186
    >>> class ObjectThatHasUrl:
2442
1187
    ...     implements(ICanonicalUrlData)
1187
    ...     implements(ICanonicalUrlData)
2443
1188
    ...     path = 'bonobo/saki'
1188
    ...     path = 'bonobo/saki'
2444
1189
1189
2445
=== modified file 'lib/lp/app/stories/basics/xx-beta-testers-redirection.txt'
2446
--- lib/lp/app/stories/basics/xx-beta-testers-redirection.txt	2010-10-03 15:30:06 +0000
2447
+++ lib/lp/app/stories/basics/xx-beta-testers-redirection.txt	2010-10-21 19:08:55 +0000
2448
@@ -203,8 +203,8 @@
2449
203
Add Foo Bar to the beta team.
203
Add Foo Bar to the beta team.
2450
204
204
2451
205
    >>> from zope.component import getUtility
205
    >>> from zope.component import getUtility
2454
206
    >>> from canonical.launchpad.interfaces import (
206
    >>> from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
2455
207
    ...     ILaunchpadCelebrities, IPersonSet)
207
    >>> from lp.registry.interfaces.person import IPersonSet
2456
208
    >>> from canonical.launchpad.ftests import login, logout
208
    >>> from canonical.launchpad.ftests import login, logout
2457
209
    >>> login('foo.bar@canonical.com')
209
    >>> login('foo.bar@canonical.com')
2458
210
    >>> foo_bar = getUtility(IPersonSet).getByName('name16')
210
    >>> foo_bar = getUtility(IPersonSet).getByName('name16')
2459
211
211
2460
=== modified file 'lib/lp/archivepublisher/tests/archive-signing.txt'
2461
--- lib/lp/archivepublisher/tests/archive-signing.txt	2010-09-02 11:45:19 +0000
2462
+++ lib/lp/archivepublisher/tests/archive-signing.txt	2010-10-21 19:08:55 +0000
2463
@@ -32,8 +32,8 @@
2464
32
`IArchiveSet.getPPAsPendingSigningKey` allows call-sites to query for
32
`IArchiveSet.getPPAsPendingSigningKey` allows call-sites to query for
2465
33
PPA pending signing key generation.
33
PPA pending signing key generation.
2466
34
34
2467
35
    >>> from lp.registry.interfaces.person import IPersonSet
2468
35
    >>> from lp.soyuz.interfaces.archive import IArchiveSet
36
    >>> from lp.soyuz.interfaces.archive import IArchiveSet
2469
36
    >>> from lp.registry.interfaces.person import IPersonSet
2470
37
37
2471
38
Only PPAs with at least one source publication are considered.
38
Only PPAs with at least one source publication are considered.
2472
39
39
2473
40
40
2474
=== modified file 'lib/lp/archivepublisher/tests/publishing-meta-data-files.txt'
2475
--- lib/lp/archivepublisher/tests/publishing-meta-data-files.txt	2010-08-24 13:47:37 +0000
2476
+++ lib/lp/archivepublisher/tests/publishing-meta-data-files.txt	2010-10-21 19:08:55 +0000
2477
@@ -11,12 +11,12 @@
2478
11
11
2479
12
    >>> from canonical.launchpad.interfaces.librarian import (
12
    >>> from canonical.launchpad.interfaces.librarian import (
2480
13
    ...     ILibraryFileAliasSet)
13
    ...     ILibraryFileAliasSet)
2481
14
    >>> from cStringIO import StringIO
2482
14
    >>> from lp.archiveuploader.tests import mock_logger
15
    >>> from lp.archiveuploader.tests import mock_logger
2483
15
    >>> from lp.registry.interfaces.distribution import IDistributionSet
16
    >>> from lp.registry.interfaces.distribution import IDistributionSet
2484
17
    >>> from lp.soyuz.enums import PackageUploadCustomFormat
2485
16
    >>> from lp.soyuz.interfaces.publishing import PackagePublishingPocket
18
    >>> from lp.soyuz.interfaces.publishing import PackagePublishingPocket
2486
17
    >>> from lp.soyuz.enums import PackageUploadCustomFormat
2487
18
    >>> from lp.soyuz.model.queue import PackageUploadCustom
19
    >>> from lp.soyuz.model.queue import PackageUploadCustom
2488
19
    >>> from cStringIO import StringIO
2489
20
20
2490
21
    >>> bat = getUtility(IDistributionSet)['ubuntutest']['breezy-autotest']
21
    >>> bat = getUtility(IDistributionSet)['ubuntutest']['breezy-autotest']
2491
22
    >>> ppa = factory.makeArchive(distribution=bat.distribution)
22
    >>> ppa = factory.makeArchive(distribution=bat.distribution)
2492
23
23
2493
=== modified file 'lib/lp/archiveuploader/tests/nascentupload-announcements.txt'
2494
--- lib/lp/archiveuploader/tests/nascentupload-announcements.txt	2010-10-03 15:30:06 +0000
2495
+++ lib/lp/archiveuploader/tests/nascentupload-announcements.txt	2010-10-21 19:08:55 +0000
2496
@@ -52,8 +52,9 @@
2497
52
distroseries so that we can upload to it. Also adjust 'changeslist'
52
distroseries so that we can upload to it. Also adjust 'changeslist'
2498
53
address and allow uploads to universe:
53
address and allow uploads to universe:
2499
54
54
2502
55
  >>> from canonical.launchpad.interfaces import (
55
  >>> from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
2503
56
  ...     SeriesStatus, IDistributionSet, ILibraryFileAliasSet)
56
  >>> from lp.registry.interfaces.distribution import IDistributionSet
2504
57
  >>> from lp.registry.interfaces.series import SeriesStatus
2505
57
  >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
58
  >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
2506
58
  >>> hoary = ubuntu['hoary']
59
  >>> hoary = ubuntu['hoary']
2507
59
  >>> hoary.status = SeriesStatus.DEVELOPMENT
60
  >>> hoary.status = SeriesStatus.DEVELOPMENT
2508
@@ -249,10 +250,10 @@
2509
249
250
2510
250
A PPA upload will contain the X-Launchpad-PPA header.
251
A PPA upload will contain the X-Launchpad-PPA header.
2511
251
252
2512
253
  >>> from lp.registry.interfaces.distribution import IDistributionSet
2513
254
  >>> from lp.registry.interfaces.person import IPersonSet
2514
252
  >>> from lp.soyuz.enums import ArchivePurpose
255
  >>> from lp.soyuz.enums import ArchivePurpose
2515
253
  >>> from lp.soyuz.interfaces.archive import IArchiveSet
256
  >>> from lp.soyuz.interfaces.archive import IArchiveSet
2516
254
  >>> from lp.registry.interfaces.distribution import IDistributionSet
2517
255
  >>> from lp.registry.interfaces.person import IPersonSet
2518
256
257
2519
257
  >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
258
  >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
2520
258
  >>> name16 = getUtility(IPersonSet).getByName('name16')
259
  >>> name16 = getUtility(IPersonSet).getByName('name16')
2521
259
260
2522
=== modified file 'lib/lp/archiveuploader/tests/nascentupload-closing-bugs.txt'
2523
--- lib/lp/archiveuploader/tests/nascentupload-closing-bugs.txt	2010-10-09 16:36:22 +0000
2524
+++ lib/lp/archiveuploader/tests/nascentupload-closing-bugs.txt	2010-10-21 19:08:55 +0000
2525
@@ -32,8 +32,9 @@
2526
32
32
2527
33
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
33
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
2528
34
    >>> from lp.bugs.interfaces.bug import IBugSet
34
    >>> from lp.bugs.interfaces.bug import IBugSet
2531
35
    >>> from canonical.launchpad.interfaces import (
35
    >>> from lp.bugs.interfaces.bugtask import IBugTaskSet
2532
36
    ...    IBugTaskSet, IDistributionSet, IPersonSet)
36
    >>> from lp.registry.interfaces.distribution import IDistributionSet
2533
37
    >>> from lp.registry.interfaces.person import IPersonSet
2534
37
    >>> login('no-priv@canonical.com')
38
    >>> login('no-priv@canonical.com')
2535
38
    >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
39
    >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
2536
39
40
2537
40
41
2538
=== modified file 'lib/lp/archiveuploader/tests/nascentupload-packageset.txt'
2539
--- lib/lp/archiveuploader/tests/nascentupload-packageset.txt	2010-10-09 16:36:22 +0000
2540
+++ lib/lp/archiveuploader/tests/nascentupload-packageset.txt	2010-10-21 19:08:55 +0000
2541
@@ -4,11 +4,12 @@
2542
4
    >>> from lp.archiveuploader.tests import (
4
    >>> from lp.archiveuploader.tests import (
2543
5
    ...     datadir, getPolicy, mock_logger_quiet)
5
    ...     datadir, getPolicy, mock_logger_quiet)
2544
6
    >>> from canonical.database.sqlbase import commit
6
    >>> from canonical.database.sqlbase import commit
2545
7
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
2546
8
    >>> from lp.registry.interfaces.person import IPersonSet
2547
9
    >>> from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
2548
7
    >>> from lp.soyuz.enums import ArchivePermissionType
10
    >>> from lp.soyuz.enums import ArchivePermissionType
2553
8
    >>> from canonical.launchpad.interfaces import (
11
    >>> from lp.soyuz.interfaces.archivepermission import IArchivePermissionSet
2554
9
    ...     IArchivePermissionSet, IPackagesetSet,
12
    >>> from lp.soyuz.interfaces.packageset import IPackagesetSet
2551
10
    ...     IPersonSet, ISourcePackageNameSet)
2552
11
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
2555
12
13
2556
13
    >>> insecure_policy = getPolicy(
14
    >>> insecure_policy = getPolicy(
2557
14
    ...     name='insecure', distro='ubuntu', distroseries='hoary')
15
    ...     name='insecure', distro='ubuntu', distroseries='hoary')
2558
15
16
2559
=== modified file 'lib/lp/archiveuploader/tests/nascentupload.txt'
2560
--- lib/lp/archiveuploader/tests/nascentupload.txt	2010-10-19 09:00:29 +0000
2561
+++ lib/lp/archiveuploader/tests/nascentupload.txt	2010-10-21 19:08:55 +0000
2562
@@ -12,8 +12,8 @@
2563
12
For the purpose of this test, hoary needs to be an open (development)
12
For the purpose of this test, hoary needs to be an open (development)
2564
13
distroseries so that we can upload to it.
13
distroseries so that we can upload to it.
2565
14
14
2568
15
  >>> from canonical.launchpad.interfaces import (
15
  >>> from lp.registry.interfaces.distribution import IDistributionSet
2569
16
  ...     SeriesStatus, IDistributionSet)
16
  >>> from lp.registry.interfaces.series import SeriesStatus
2570
17
  >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
17
  >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
2571
18
  >>> hoary = ubuntu['hoary']
18
  >>> hoary = ubuntu['hoary']
2572
19
  >>> hoary.status = SeriesStatus.DEVELOPMENT
19
  >>> hoary.status = SeriesStatus.DEVELOPMENT
2573
@@ -740,8 +740,8 @@
2574
740
  False
740
  False
2575
741
741
2576
742
  >>> from canonical.launchpad.webapp.testing import verifyObject
742
  >>> from canonical.launchpad.webapp.testing import verifyObject
2579
743
  >>> from canonical.launchpad.interfaces import (
743
  >>> from lp.registry.interfaces.gpg import IGPGKey
2580
744
  ...    IGPGKey, IPersonSet)
744
  >>> from lp.registry.interfaces.person import IPersonSet
2581
745
745
2582
746
  >>> verifyObject(IGPGKey, bar_ok.changes.dsc.signingkey)
746
  >>> verifyObject(IGPGKey, bar_ok.changes.dsc.signingkey)
2583
747
  True
747
  True
2584
@@ -815,8 +815,8 @@
2585
815
815
2586
816
    >>> commit()
816
    >>> commit()
2587
817
    >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
817
    >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
2588
818
    >>> from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
2589
818
    >>> from lp.soyuz.enums import ArchivePermissionType
819
    >>> from lp.soyuz.enums import ArchivePermissionType
2590
819
    >>> from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
2591
820
    >>> bar_name = getUtility(ISourcePackageNameSet).getOrCreateByName("bar")
820
    >>> bar_name = getUtility(ISourcePackageNameSet).getOrCreateByName("bar")
2592
821
    >>> discard = ArchivePermission(
821
    >>> discard = ArchivePermission(
2593
822
    ...     archive=ubuntu.main_archive, person=name16,
822
    ...     archive=ubuntu.main_archive, person=name16,
2594
823
823
2595
=== modified file 'lib/lp/archiveuploader/tests/upload-karma.txt'
2596
--- lib/lp/archiveuploader/tests/upload-karma.txt	2010-10-10 15:39:28 +0000
2597
+++ lib/lp/archiveuploader/tests/upload-karma.txt	2010-10-21 19:08:55 +0000
2598
@@ -49,9 +49,9 @@
2599
49
49
2600
50
Poke the queue entry so it looks like Foo Bar (name16) uploaded it:
50
Poke the queue entry so it looks like Foo Bar (name16) uploaded it:
2601
51
51
2602
52
    >>> from zope.security.proxy import removeSecurityProxy
2603
52
    >>> from lp.registry.interfaces.gpg import IGPGKeySet
53
    >>> from lp.registry.interfaces.gpg import IGPGKeySet
2604
53
    >>> from lp.registry.interfaces.person import IPersonSet
54
    >>> from lp.registry.interfaces.person import IPersonSet
2605
54
    >>> from zope.security.proxy import removeSecurityProxy
2606
55
    >>> name16 = getUtility(IPersonSet).getByName('name16')
55
    >>> name16 = getUtility(IPersonSet).getByName('name16')
2607
56
    >>> key = getUtility(IGPGKeySet).getGPGKeysForPeople([name16])[0]
56
    >>> key = getUtility(IGPGKeySet).getGPGKeysForPeople([name16])[0]
2608
57
    >>> removeSecurityProxy(foo_src.queue_root).signing_key = key
57
    >>> removeSecurityProxy(foo_src.queue_root).signing_key = key
2609
@@ -83,9 +83,9 @@
2610
83
will generate another different karma event for the uploader.
83
will generate another different karma event for the uploader.
2611
84
84
2612
85
    >>> from lp.archiveuploader.tests import getPolicy
85
    >>> from lp.archiveuploader.tests import getPolicy
2613
86
    >>> from lp.registry.interfaces.distribution import IDistributionSet
2614
86
    >>> from lp.soyuz.enums import ArchivePurpose
87
    >>> from lp.soyuz.enums import ArchivePurpose
2615
87
    >>> from lp.soyuz.interfaces.archive import IArchiveSet
88
    >>> from lp.soyuz.interfaces.archive import IArchiveSet
2616
88
    >>> from lp.registry.interfaces.distribution import IDistributionSet
2617
89
    >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
89
    >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
2618
90
    >>> name16_ppa = getUtility(IArchiveSet).new(
90
    >>> name16_ppa = getUtility(IArchiveSet).new(
2619
91
    ...     owner=name16, distribution=ubuntu, purpose=ArchivePurpose.PPA)
91
    ...     owner=name16, distribution=ubuntu, purpose=ArchivePurpose.PPA)
2620
92
92
2621
=== modified file 'lib/lp/archiveuploader/tests/uploadpolicy.txt'
2622
--- lib/lp/archiveuploader/tests/uploadpolicy.txt	2010-10-06 11:46:51 +0000
2623
+++ lib/lp/archiveuploader/tests/uploadpolicy.txt	2010-10-21 19:08:55 +0000
2624
@@ -78,8 +78,8 @@
2625
78
approve an upload automatically (I.E. move it straight to ACCEPTED
78
approve an upload automatically (I.E. move it straight to ACCEPTED
2626
79
instead of UNAPPROVED)
79
instead of UNAPPROVED)
2627
80
80
2630
81
  >>> from canonical.launchpad.interfaces import (
81
  >>> from lp.registry.interfaces.distribution import IDistributionSet
2631
82
  ...     SeriesStatus, IDistributionSet)
82
  >>> from lp.registry.interfaces.series import SeriesStatus
2632
83
  >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
83
  >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
2633
84
  >>> hoary = ubuntu['hoary']
84
  >>> hoary = ubuntu['hoary']
2634
85
85
2635
86
86
2636
=== modified file 'lib/lp/blueprints/doc/spec-mail-exploder.txt'
2637
--- lib/lp/blueprints/doc/spec-mail-exploder.txt	2010-10-12 14:03:44 +0000
2638
+++ lib/lp/blueprints/doc/spec-mail-exploder.txt	2010-10-21 19:08:55 +0000
2639
@@ -268,8 +268,8 @@
2640
268
    ...     config.launchpad.specs_domain)
268
    ...     config.launchpad.specs_domain)
2641
269
    >>> moin_change['Sender'] = 'webmaster@ubuntu.com'
269
    >>> moin_change['Sender'] = 'webmaster@ubuntu.com'
2642
270
270
2643
271
    >>> from lp.services.mail.incoming import handleMail
2644
271
    >>> from lp.services.mail.sendmail import sendmail
272
    >>> from lp.services.mail.sendmail import sendmail
2645
272
    >>> from lp.services.mail.incoming import handleMail
2646
273
    >>> sendmail(moin_change, bulk=False)
273
    >>> sendmail(moin_change, bulk=False)
2647
274
    '...'
274
    '...'
2648
275
275
2649
276
276
2650
=== modified file 'lib/lp/blueprints/doc/specgraph.txt'
2651
--- lib/lp/blueprints/doc/specgraph.txt	2010-07-30 12:56:27 +0000
2652
+++ lib/lp/blueprints/doc/specgraph.txt	2010-10-21 19:08:55 +0000
2653
@@ -256,8 +256,8 @@
2654
256
    >>> from zope.component import getMultiAdapter
256
    >>> from zope.component import getMultiAdapter
2655
257
    >>> from lp.blueprints.browser.specification import (
257
    >>> from lp.blueprints.browser.specification import (
2656
258
    ...     SpecificationTreeImageTag)
258
    ...     SpecificationTreeImageTag)
2657
259
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
2658
259
    >>> from lp.registry.interfaces.product import IProductSet
260
    >>> from lp.registry.interfaces.product import IProductSet
2659
260
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
2660
261
261
2661
262
    >>> firefox = getUtility(IProductSet).getByName('firefox')
262
    >>> firefox = getUtility(IProductSet).getByName('firefox')
2662
263
    >>> svg_support = firefox.getSpecification('svg-support')
263
    >>> svg_support = firefox.getSpecification('svg-support')
2663
264
264
2664
=== modified file 'lib/lp/blueprints/doc/specification-branch.txt'
2665
--- lib/lp/blueprints/doc/specification-branch.txt	2010-07-30 12:56:27 +0000
2666
+++ lib/lp/blueprints/doc/specification-branch.txt	2010-10-21 19:08:55 +0000
2667
@@ -14,8 +14,8 @@
2668
14
    >>> from zope.component import getUtility
14
    >>> from zope.component import getUtility
2669
15
    >>> from canonical.launchpad.interfaces.launchpad import (
15
    >>> from canonical.launchpad.interfaces.launchpad import (
2670
16
    ...     ILaunchpadCelebrities)
16
    ...     ILaunchpadCelebrities)
2671
17
    >>> from lp.code.interfaces.branchlookup import IBranchLookup
2672
17
    >>> from lp.registry.interfaces.person import IPersonSet
18
    >>> from lp.registry.interfaces.person import IPersonSet
2673
18
    >>> from lp.code.interfaces.branchlookup import IBranchLookup
2674
19
19
2675
20
    >>> ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
20
    >>> ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
2676
21
    >>> spec = ubuntu.getSpecification('media-integrity-check')
21
    >>> spec = ubuntu.getSpecification('media-integrity-check')
2677
22
22
2678
=== modified file 'lib/lp/blueprints/doc/specification-notifications.txt'
2679
--- lib/lp/blueprints/doc/specification-notifications.txt	2010-07-30 12:56:27 +0000
2680
+++ lib/lp/blueprints/doc/specification-notifications.txt	2010-10-21 19:08:55 +0000
2681
@@ -8,8 +8,8 @@
2682
8
Changing the status:
8
Changing the status:
2683
9
9
2684
10
    >>> from zope.component import getMultiAdapter
10
    >>> from zope.component import getMultiAdapter
2685
11
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
2686
11
    >>> from lp.registry.interfaces.product import IProductSet
12
    >>> from lp.registry.interfaces.product import IProductSet
2687
12
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
2688
13
13
2689
14
    >>> login('foo.bar@canonical.com')
14
    >>> login('foo.bar@canonical.com')
2690
15
    >>> firefox = getUtility(IProductSet).getByName('firefox')
15
    >>> firefox = getUtility(IProductSet).getByName('firefox')
2691
16
16
2692
=== modified file 'lib/lp/blueprints/doc/specification.txt'
2693
--- lib/lp/blueprints/doc/specification.txt	2010-07-30 12:56:27 +0000
2694
+++ lib/lp/blueprints/doc/specification.txt	2010-10-21 19:08:55 +0000
2695
@@ -117,9 +117,9 @@
2696
117
ISpecification.getDelta(). If there are no changes, None will be
117
ISpecification.getDelta(). If there are no changes, None will be
2697
118
returned:
118
returned:
2698
119
119
2699
120
    >>> from zope.interface import providedBy
2700
121
    >>> from lazr.lifecycle.snapshot import Snapshot
2701
120
    >>> from lp.bugs.interfaces.bug import IBugSet
122
    >>> from lp.bugs.interfaces.bug import IBugSet
2702
121
    >>> from lazr.lifecycle.snapshot import Snapshot
2703
122
    >>> from zope.interface import providedBy
2704
123
    >>> unmodified_spec = Snapshot(ubuspec, providing=providedBy(ubuspec))
123
    >>> unmodified_spec = Snapshot(ubuspec, providing=providedBy(ubuspec))
2705
124
    >>> ubuspec.getDelta(unmodified_spec, jdub) is None
124
    >>> ubuspec.getDelta(unmodified_spec, jdub) is None
2706
125
    True
125
    True
2707
126
126
2708
=== modified file 'lib/lp/blueprints/doc/sprint-agenda.txt'
2709
--- lib/lp/blueprints/doc/sprint-agenda.txt	2009-07-24 12:55:03 +0000
2710
+++ lib/lp/blueprints/doc/sprint-agenda.txt	2010-10-21 19:08:55 +0000
2711
@@ -9,8 +9,8 @@
2712
9
First, lets get hold of some people, a product, a sprint and a spec.
9
First, lets get hold of some people, a product, a sprint and a spec.
2713
10
10
2714
11
    >>> from lp.blueprints.model.sprint import SprintSet
11
    >>> from lp.blueprints.model.sprint import SprintSet
2715
12
    >>> from lp.registry.model.person import PersonSet
2716
12
    >>> from lp.registry.model.product import ProductSet
13
    >>> from lp.registry.model.product import ProductSet
2717
13
    >>> from lp.registry.model.person import PersonSet
2718
14
    >>> upstream_firefox = ProductSet()['firefox']
14
    >>> upstream_firefox = ProductSet()['firefox']
2719
15
    >>> canvas = upstream_firefox.getSpecification('canvas')
15
    >>> canvas = upstream_firefox.getSpecification('canvas')
2720
16
    >>> guacamole = SprintSet()['uds-guacamole']
16
    >>> guacamole = SprintSet()['uds-guacamole']
2721
17
17
2722
=== modified file 'lib/lp/blueprints/doc/sprint-meeting-export.txt'
2723
--- lib/lp/blueprints/doc/sprint-meeting-export.txt	2010-07-30 12:56:27 +0000
2724
+++ lib/lp/blueprints/doc/sprint-meeting-export.txt	2010-10-21 19:08:55 +0000
2725
@@ -13,10 +13,10 @@
2726
13
    >>> from pytz import timezone
13
    >>> from pytz import timezone
2727
14
    >>> from zope.component import getUtility, getMultiAdapter
14
    >>> from zope.component import getUtility, getMultiAdapter
2728
15
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
15
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
2729
16
    >>> from lp.blueprints.browser.sprint import SprintMeetingExportView
2730
17
    >>> from lp.blueprints.interfaces.sprint import ISprintSet
2731
16
    >>> from lp.registry.interfaces.person import IPersonSet
18
    >>> from lp.registry.interfaces.person import IPersonSet
2732
17
    >>> from lp.registry.interfaces.product import IProductSet
19
    >>> from lp.registry.interfaces.product import IProductSet
2733
18
    >>> from lp.blueprints.interfaces.sprint import ISprintSet
2734
19
    >>> from lp.blueprints.browser.sprint import SprintMeetingExportView
2735
20
20
2736
21
Look up a few Launchpad objects to be used in the tests
21
Look up a few Launchpad objects to be used in the tests
2737
22
22
2738
23
23
2739
=== modified file 'lib/lp/blueprints/doc/sprint.txt'
2740
--- lib/lp/blueprints/doc/sprint.txt	2010-07-30 12:56:27 +0000
2741
+++ lib/lp/blueprints/doc/sprint.txt	2010-10-21 19:08:55 +0000
2742
@@ -4,8 +4,8 @@
2743
4
Sprints or meetings can be coordinated using Launchpad.
4
Sprints or meetings can be coordinated using Launchpad.
2744
5
5
2745
6
    >>> from zope.component import getUtility
6
    >>> from zope.component import getUtility
2746
7
    >>> from lp.blueprints.interfaces.sprint import ISprintSet
2747
7
    >>> from lp.registry.interfaces.person import IPersonSet
8
    >>> from lp.registry.interfaces.person import IPersonSet
2748
8
    >>> from lp.blueprints.interfaces.sprint import ISprintSet
2749
9
    >>> sprintset = getUtility(ISprintSet)
9
    >>> sprintset = getUtility(ISprintSet)
2750
10
10
2751
11
To find a sprint by name, use:
11
To find a sprint by name, use:
2752
@@ -15,9 +15,9 @@
2753
15
The major pillars, product, distribution and project, have some
15
The major pillars, product, distribution and project, have some
2754
16
properties which give us the sprints relevant to them.
16
properties which give us the sprints relevant to them.
2755
17
17
2756
18
    >>> from lp.registry.interfaces.distribution import IDistributionSet
2757
18
    >>> from lp.registry.interfaces.product import IProductSet
19
    >>> from lp.registry.interfaces.product import IProductSet
2758
19
    >>> from lp.registry.interfaces.projectgroup import IProjectGroupSet
20
    >>> from lp.registry.interfaces.projectgroup import IProjectGroupSet
2759
20
    >>> from lp.registry.interfaces.distribution import IDistributionSet
2760
21
21
2761
22
    >>> productset = getUtility(IProductSet)
22
    >>> productset = getUtility(IProductSet)
2762
23
    >>> projectset = getUtility(IProjectGroupSet)
23
    >>> projectset = getUtility(IProjectGroupSet)
2763
@@ -156,8 +156,8 @@
2764
156
156
2765
157
Inactive products are excluded from the listings.
157
Inactive products are excluded from the listings.
2766
158
158
2767
159
    >>> from lp.registry.interfaces.product import IProductSet
2768
160
    >>> from canonical.launchpad.ftests import login
159
    >>> from canonical.launchpad.ftests import login
2769
160
    >>> from lp.registry.interfaces.product import IProductSet
2770
161
161
2771
162
    >>> firefox = getUtility(IProductSet).getByName('firefox')
162
    >>> firefox = getUtility(IProductSet).getByName('firefox')
2772
163
    >>> login("foo.bar@canonical.com")
163
    >>> login("foo.bar@canonical.com")
2773
164
164
2774
=== modified file 'lib/lp/blueprints/stories/sprints/20-sprint-registration.txt'
2775
--- lib/lp/blueprints/stories/sprints/20-sprint-registration.txt	2010-07-30 12:56:27 +0000
2776
+++ lib/lp/blueprints/stories/sprints/20-sprint-registration.txt	2010-10-21 19:08:55 +0000
2777
@@ -157,9 +157,9 @@
2778
157
First, we add a couple of IRC nicknames for Carlos.
157
First, we add a couple of IRC nicknames for Carlos.
2779
158
158
2780
159
    >>> from canonical.launchpad.ftests import login, logout
159
    >>> from canonical.launchpad.ftests import login, logout
2781
160
    >>> from zope.component import getUtility
2782
160
    >>> from lp.registry.interfaces.person import IPersonSet
161
    >>> from lp.registry.interfaces.person import IPersonSet
2783
161
    >>> from lp.registry.model.person import IrcID
162
    >>> from lp.registry.model.person import IrcID
2784
162
    >>> from zope.component import getUtility
2785
163
    >>> login('carlos@canonical.com')
163
    >>> login('carlos@canonical.com')
2786
164
    >>> carlos = getUtility(IPersonSet).getByName('carlos')
164
    >>> carlos = getUtility(IPersonSet).getByName('carlos')
2787
165
    >>> IrcID(person=carlos, network='freenode', nickname='carlos')
165
    >>> IrcID(person=carlos, network='freenode', nickname='carlos')
2788
166
166
2789
=== modified file 'lib/lp/bugs/browser/tests/bug-nomination-views.txt'
2790
--- lib/lp/bugs/browser/tests/bug-nomination-views.txt	2010-10-11 16:17:45 +0000
2791
+++ lib/lp/bugs/browser/tests/bug-nomination-views.txt	2010-10-21 19:08:55 +0000
2792
@@ -7,9 +7,9 @@
2793
7
7
2794
8
    >>> from zope.component import getUtility, getMultiAdapter
8
    >>> from zope.component import getUtility, getMultiAdapter
2795
9
9
2796
10
    >>> from lp.bugs.interfaces.bugtask import IBugTaskSet
2797
11
    >>> from canonical.launchpad.webapp.interfaces import IOpenLaunchBag
10
    >>> from canonical.launchpad.webapp.interfaces import IOpenLaunchBag
2798
12
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
11
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
2799
12
    >>> from lp.bugs.interfaces.bugtask import IBugTaskSet
2800
13
13
2801
14
    >>> login("no-priv@canonical.com")
14
    >>> login("no-priv@canonical.com")
2802
15
15
2803
16
16
2804
=== modified file 'lib/lp/bugs/browser/tests/bug-views.txt'
2805
--- lib/lp/bugs/browser/tests/bug-views.txt	2010-10-14 18:42:19 +0000
2806
+++ lib/lp/bugs/browser/tests/bug-views.txt	2010-10-21 19:08:55 +0000
2807
@@ -27,10 +27,19 @@
2808
27
comment, of the bug report.
27
comment, of the bug report.
2809
28
28
2810
29
    >>> from zope.component import getMultiAdapter, getUtility
29
    >>> from zope.component import getMultiAdapter, getUtility
2814
30
    >>> from canonical.launchpad.interfaces import (
30
    >>> from canonical.launchpad.webapp.interfaces import (
2815
31
    ...     BugTaskSearchParams, IDistributionSet, IBugSet, IBugTaskSet,
31
    ...     ILaunchBag,
2816
32
    ...     ILaunchBag, IOpenLaunchBag, IPersonSet, IProductSet)
32
    ...     IOpenLaunchBag,
2817
33
    ...     )
2818
33
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
34
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
2819
35
    >>> from lp.bugs.interfaces.bug import IBugSet
2820
36
    >>> from lp.bugs.interfaces.bugtask import (
2821
37
    ...     BugTaskSearchParams,
2822
38
    ...     IBugTaskSet,
2823
39
    ...     )
2824
40
    >>> from lp.registry.interfaces.distribution import IDistributionSet
2825
41
    >>> from lp.registry.interfaces.person import IPersonSet
2826
42
    >>> from lp.registry.interfaces.product import IProductSet
2827
34
43
2828
35
    >>> launchbag = getUtility(IOpenLaunchBag)
44
    >>> launchbag = getUtility(IOpenLaunchBag)
2829
36
    >>> login("foo.bar@canonical.com")
45
    >>> login("foo.bar@canonical.com")
2830
@@ -444,8 +453,8 @@
2831
444
returned results, because an approved nomination will have created a
453
returned results, because an approved nomination will have created a
2832
445
task anyway.
454
task anyway.
2833
446
455
2834
456
    >>> from lp.bugs.interfaces.bugnomination import IBugNomination
2835
447
    >>> from lp.bugs.interfaces.bugtask import IBugTask
457
    >>> from lp.bugs.interfaces.bugtask import IBugTask
2836
448
    >>> from lp.bugs.interfaces.bugnomination import IBugNomination
2837
449
458
2838
450
    >>> def get_object_type(task_or_nomination):
459
    >>> def get_object_type(task_or_nomination):
2839
451
    ...     if IBugTask.providedBy(task_or_nomination):
460
    ...     if IBugTask.providedBy(task_or_nomination):
2840
452
461
2841
=== modified file 'lib/lp/bugs/browser/tests/buglinktarget-views.txt'
2842
--- lib/lp/bugs/browser/tests/buglinktarget-views.txt	2010-10-03 15:30:06 +0000
2843
+++ lib/lp/bugs/browser/tests/buglinktarget-views.txt	2010-10-21 19:08:55 +0000
2844
@@ -4,9 +4,10 @@
2845
4
4
2846
5
    >>> from zope.component import getMultiAdapter
5
    >>> from zope.component import getMultiAdapter
2847
6
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
6
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
2848
7
    >>> from canonical.launchpad.interfaces import (
2849
8
    ...     IBugLinkTarget, IBugSet, ICveSet)
2850
9
    >>> from lazr.lifecycle.event import ObjectModifiedEvent
7
    >>> from lazr.lifecycle.event import ObjectModifiedEvent
2851
8
    >>> from lp.bugs.interfaces.bug import IBugSet
2852
9
    >>> from lp.bugs.interfaces.buglink import IBugLinkTarget
2853
10
    >>> from lp.bugs.interfaces.cve import ICveSet
2854
10
11
2855
11
    >>> bugset = getUtility(IBugSet)
12
    >>> bugset = getUtility(IBugSet)
2856
12
    >>> cve = getUtility(ICveSet)['2005-2730']
13
    >>> cve = getUtility(ICveSet)['2005-2730']
2857
13
14
2858
=== modified file 'lib/lp/bugs/browser/tests/bugs-views.txt'
2859
--- lib/lp/bugs/browser/tests/bugs-views.txt	2010-10-11 16:17:45 +0000
2860
+++ lib/lp/bugs/browser/tests/bugs-views.txt	2010-10-21 19:08:55 +0000
2861
@@ -4,9 +4,9 @@
2862
4
doesn't use its context for anything, so we don't have to supply one
4
doesn't use its context for anything, so we don't have to supply one
2863
5
when creating it.
5
when creating it.
2864
6
6
2865
7
    >>> from lp.bugs.browser.bug import MaloneView
2866
8
    >>> from canonical.launchpad.systemhomes import MaloneApplication
7
    >>> from canonical.launchpad.systemhomes import MaloneApplication
2867
9
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
8
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
2868
9
    >>> from lp.bugs.browser.bug import MaloneView
2869
10
    >>> bugs_view = MaloneView(MaloneApplication(), LaunchpadTestRequest())
10
    >>> bugs_view = MaloneView(MaloneApplication(), LaunchpadTestRequest())
2870
11
    >>> bugs_view.initialize()
11
    >>> bugs_view.initialize()
2871
12
12
2872
@@ -31,8 +31,8 @@
2873
31
in the future.
31
in the future.
2874
32
32
2875
33
    >>> login('test@canonical.com')
33
    >>> login('test@canonical.com')
2876
34
    >>> from canonical.launchpad.ftests import syncUpdate
2877
34
    >>> from lp.bugs.interfaces.bug import IBugSet
35
    >>> from lp.bugs.interfaces.bug import IBugSet
2878
35
    >>> from canonical.launchpad.ftests import syncUpdate
2879
36
    >>> bug_eight = getUtility(IBugSet).get(8)
36
    >>> bug_eight = getUtility(IBugSet).get(8)
2880
37
    >>> len(bug_eight.bugtasks)
37
    >>> len(bug_eight.bugtasks)
2881
38
    1
38
    1
2882
39
39
2883
=== modified file 'lib/lp/bugs/browser/tests/bugtask-adding-views.txt'
2884
--- lib/lp/bugs/browser/tests/bugtask-adding-views.txt	2010-10-09 16:36:22 +0000
2885
+++ lib/lp/bugs/browser/tests/bugtask-adding-views.txt	2010-10-21 19:08:55 +0000
2886
@@ -97,8 +97,8 @@
2887
97
most likely to get added. Let's take a look how it works for packages,
97
most likely to get added. Let's take a look how it works for packages,
2888
98
which can have packaging links that helps us choose the product.
98
which can have packaging links that helps us choose the product.
2889
99
99
2892
100
    >>> from canonical.launchpad.interfaces import (
100
    >>> from lp.bugs.interfaces.bug import CreateBugParams
2893
101
    ...     CreateBugParams, IDistributionSet)
101
    >>> from lp.registry.interfaces.distribution import IDistributionSet
2894
102
    >>> owner = getUtility(ILaunchBag).user
102
    >>> owner = getUtility(ILaunchBag).user
2895
103
    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
103
    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
2896
104
    >>> ubuntu_firefox = ubuntu.getSourcePackage('mozilla-firefox')
104
    >>> ubuntu_firefox = ubuntu.getSourcePackage('mozilla-firefox')
2897
@@ -168,8 +168,8 @@
2898
168
event listener and register it:
168
event listener and register it:
2899
169
169
2900
170
    >>> from zope.interface import Interface
170
    >>> from zope.interface import Interface
2901
171
    >>> from canonical.launchpad.ftests.event import TestEventListener
2902
171
    >>> from lazr.lifecycle.interfaces import IObjectCreatedEvent
172
    >>> from lazr.lifecycle.interfaces import IObjectCreatedEvent
2903
172
    >>> from canonical.launchpad.ftests.event import TestEventListener
2904
173
173
2905
174
    >>> def on_created_event(object, event):
174
    >>> def on_created_event(object, event):
2906
175
    ...     print "ObjectCreatedEvent: %r" % object
175
    ...     print "ObjectCreatedEvent: %r" % object
2907
176
176
2908
=== modified file 'lib/lp/bugs/browser/tests/bugtask-edit-views.txt'
2909
--- lib/lp/bugs/browser/tests/bugtask-edit-views.txt	2010-10-09 16:36:22 +0000
2910
+++ lib/lp/bugs/browser/tests/bugtask-edit-views.txt	2010-10-21 19:08:55 +0000
2911
@@ -10,8 +10,8 @@
2912
10
Person:
10
Person:
2913
11
11
2914
12
    >>> from zope.component import getMultiAdapter
12
    >>> from zope.component import getMultiAdapter
2915
13
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
2916
13
    >>> from lp.bugs.interfaces.bug import IBugSet
14
    >>> from lp.bugs.interfaces.bug import IBugSet
2917
14
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
2918
15
    >>> login('test@canonical.com')
15
    >>> login('test@canonical.com')
2919
16
    >>> bug_nine = getUtility(IBugSet).get(9)
16
    >>> bug_nine = getUtility(IBugSet).get(9)
2920
17
    >>> ubuntu_thunderbird_task = bug_nine.bugtasks[1]
17
    >>> ubuntu_thunderbird_task = bug_nine.bugtasks[1]
2921
@@ -83,8 +83,8 @@
2922
83
distribution task already has, an error message will occur. First,
83
distribution task already has, an error message will occur. First,
2923
84
let's add an evolution (Ubuntu) task to bug two.
84
let's add an evolution (Ubuntu) task to bug two.
2924
85
85
2927
86
    >>> from canonical.launchpad.interfaces import (
86
    >>> from lp.bugs.interfaces.bugtask import IBugTaskSet
2928
87
    ...     IBugTaskSet, IDistributionSet)
87
    >>> from lp.registry.interfaces.distribution import IDistributionSet
2929
88
    >>> bug_two = getUtility(IBugSet).get(2)
88
    >>> bug_two = getUtility(IBugSet).get(2)
2930
89
    >>> ubuntu = getUtility(IDistributionSet).getByName("ubuntu")
89
    >>> ubuntu = getUtility(IDistributionSet).getByName("ubuntu")
2931
90
    >>> ubuntu_evolution = ubuntu.getSourcePackage('evolution')
90
    >>> ubuntu_evolution = ubuntu.getSourcePackage('evolution')
2932
91
91
2933
=== modified file 'lib/lp/bugs/browser/tests/bugtask-search-views.txt'
2934
--- lib/lp/bugs/browser/tests/bugtask-search-views.txt	2010-10-09 16:36:22 +0000
2935
+++ lib/lp/bugs/browser/tests/bugtask-search-views.txt	2010-10-21 19:08:55 +0000
2936
@@ -3,8 +3,8 @@
2937
3
In the 'Bugs' facet of a distribution we can find a list of bugs
3
In the 'Bugs' facet of a distribution we can find a list of bugs
2938
4
reported in that distribution and simple and advanced search forms.
4
reported in that distribution and simple and advanced search forms.
2939
5
5
2942
6
    >>> from canonical.launchpad.interfaces import (
6
    >>> from canonical.launchpad.webapp.interfaces import IOpenLaunchBag
2943
7
    ...     IOpenLaunchBag, IDistributionSet)
7
    >>> from lp.registry.interfaces.distribution import IDistributionSet
2944
8
    >>> launchbag = getUtility(IOpenLaunchBag)
8
    >>> launchbag = getUtility(IOpenLaunchBag)
2945
9
    >>> debian = getUtility(IDistributionSet).getByName('debian')
9
    >>> debian = getUtility(IDistributionSet).getByName('debian')
2946
10
10
2947
@@ -230,8 +230,8 @@
2948
230
And now we'll change the status of one of the bugtasks, but first we
230
And now we'll change the status of one of the bugtasks, but first we
2949
231
need to be logged in.
231
need to be logged in.
2950
232
232
2951
233
    >>> from canonical.database.sqlbase import flush_database_updates
2952
233
    >>> from canonical.launchpad.ftests import login
234
    >>> from canonical.launchpad.ftests import login
2953
234
    >>> from canonical.database.sqlbase import flush_database_updates
2954
235
235
2955
236
    >>> login("test@canonical.com")
236
    >>> login("test@canonical.com")
2956
237
237
2957
238
238
2958
=== modified file 'lib/lp/bugs/browser/tests/distrosourcepackage-bug-views.txt'
2959
--- lib/lp/bugs/browser/tests/distrosourcepackage-bug-views.txt	2010-10-03 15:30:06 +0000
2960
+++ lib/lp/bugs/browser/tests/distrosourcepackage-bug-views.txt	2010-10-21 19:08:55 +0000
2961
@@ -5,9 +5,9 @@
2962
5
Simple searching is possible on the distro source package bug view page.
5
Simple searching is possible on the distro source package bug view page.
2963
6
6
2964
7
  >>> from zope.component import getMultiAdapter, getUtility
7
  >>> from zope.component import getMultiAdapter, getUtility
2965
8
  >>> from canonical.launchpad.interfaces import (
2966
9
  ...     IDistributionSet, ISourcePackageNameSet)
2967
10
  >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
8
  >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
2968
9
  >>> from lp.registry.interfaces.distribution import IDistributionSet
2969
10
  >>> from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
2970
11
11
2971
12
  >>> debian = getUtility(IDistributionSet).get(3)
12
  >>> debian = getUtility(IDistributionSet).get(3)
2972
13
  >>> mozilla_firefox = getUtility(ISourcePackageNameSet).get(1)
13
  >>> mozilla_firefox = getUtility(ISourcePackageNameSet).get(1)
2973
14
14
2974
=== modified file 'lib/lp/bugs/browser/tests/person-bug-views.txt'
2975
--- lib/lp/bugs/browser/tests/person-bug-views.txt	2010-10-09 16:36:22 +0000
2976
+++ lib/lp/bugs/browser/tests/person-bug-views.txt	2010-10-21 19:08:55 +0000
2977
@@ -87,8 +87,8 @@
2978
87
Using the advanced form we can also query for closed bugs reported by someone.
87
Using the advanced form we can also query for closed bugs reported by someone.
2979
88
Let's first close a bug setting its status to 'Invalid'.
88
Let's first close a bug setting its status to 'Invalid'.
2980
89
89
2981
90
    >>> from canonical.database.sqlbase import flush_database_updates
2982
90
    >>> from canonical.launchpad.ftests import login
91
    >>> from canonical.launchpad.ftests import login
2983
91
    >>> from canonical.database.sqlbase import flush_database_updates
2984
92
92
2985
93
    >>> login("foo.bar@canonical.com")
93
    >>> login("foo.bar@canonical.com")
2986
94
94
2987
95
95
2988
=== modified file 'lib/lp/bugs/doc/bug-change.txt'
2989
--- lib/lp/bugs/doc/bug-change.txt	2010-10-03 15:30:06 +0000
2990
+++ lib/lp/bugs/doc/bug-change.txt	2010-10-21 19:08:55 +0000
2991
@@ -3,10 +3,10 @@
2992
3
The base class for BugChanges doesn't actually implement anything.
3
The base class for BugChanges doesn't actually implement anything.
2993
4
4
2994
5
    >>> import pytz
5
    >>> import pytz
2995
6
    >>> from canonical.launchpad.webapp.testing import verifyObject
2996
6
    >>> from datetime import datetime
7
    >>> from datetime import datetime
2997
7
    >>> from lp.bugs.adapters.bugchange import BugChangeBase
8
    >>> from lp.bugs.adapters.bugchange import BugChangeBase
2998
8
    >>> from lp.bugs.interfaces.bugchange import IBugChange
9
    >>> from lp.bugs.interfaces.bugchange import IBugChange
2999
9
    >>> from canonical.launchpad.webapp.testing import verifyObject
3000
10
10
3001
11
    >>> from lp.testing.factory import LaunchpadObjectFactory
11
    >>> from lp.testing.factory import LaunchpadObjectFactory
3002
12
    >>> factory = LaunchpadObjectFactory()
12
    >>> factory = LaunchpadObjectFactory()
3003
13
13
3004
=== modified file 'lib/lp/bugs/doc/bug-export.txt'
3005
--- lib/lp/bugs/doc/bug-export.txt	2010-10-03 15:30:06 +0000
3006
+++ lib/lp/bugs/doc/bug-export.txt	2010-10-21 19:08:55 +0000
3007
@@ -23,10 +23,11 @@
3008
23
  ...     import xml.etree.cElementTree as ET
23
  ...     import xml.etree.cElementTree as ET
3009
24
  ... except ImportError:
24
  ... except ImportError:
3010
25
  ...     import cElementTree as ET
25
  ...     import cElementTree as ET
3011
26
  >>> from zope.component import getUtility
3012
26
  >>> from cStringIO import StringIO
27
  >>> from cStringIO import StringIO
3016
27
  >>> from zope.component import getUtility
28
  >>> from lp.bugs.interfaces.bug import IBugSet
3017
28
  >>> from canonical.launchpad.interfaces import (
29
  >>> from lp.registry.interfaces.person import IPersonSet
3018
29
  ...     IBugSet, IPersonSet, IProductSet)
30
  >>> from lp.registry.interfaces.product import IProductSet
3019
30
  >>> from lp.bugs.scripts.bugexport import (
31
  >>> from lp.bugs.scripts.bugexport import (
3020
31
  ...     serialise_bugtask, export_bugtasks)
32
  ...     serialise_bugtask, export_bugtasks)
3021
32
33
3022
33
34
3023
=== modified file 'lib/lp/bugs/doc/bug-nomination.txt'
3024
--- lib/lp/bugs/doc/bug-nomination.txt	2010-10-09 16:36:22 +0000
3025
+++ lib/lp/bugs/doc/bug-nomination.txt	2010-10-21 19:08:55 +0000
3026
@@ -6,9 +6,9 @@
3027
6
6
3028
7
    >>> from zope.component import getUtility
7
    >>> from zope.component import getUtility
3029
8
    >>> from zope.interface.verify import verifyClass
8
    >>> from zope.interface.verify import verifyClass
3030
9
    >>> from lp.bugs.model.bugnomination import BugNomination
3031
10
    >>> from lp.bugs.interfaces.bug import IBugSet
9
    >>> from lp.bugs.interfaces.bug import IBugSet
3032
11
    >>> from lp.bugs.interfaces.bugnomination import IBugNomination
10
    >>> from lp.bugs.interfaces.bugnomination import IBugNomination
3033
11
    >>> from lp.bugs.model.bugnomination import BugNomination
3034
12
    >>> from lp.registry.interfaces.distribution import IDistributionSet
12
    >>> from lp.registry.interfaces.distribution import IDistributionSet
3035
13
    >>> from lp.registry.interfaces.person import IPersonSet
13
    >>> from lp.registry.interfaces.person import IPersonSet
3036
14
14
3037
15
15
3038
=== modified file 'lib/lp/bugs/doc/bug-private-by-default.txt'
3039
--- lib/lp/bugs/doc/bug-private-by-default.txt	2010-10-04 19:50:45 +0000
3040
+++ lib/lp/bugs/doc/bug-private-by-default.txt	2010-10-21 19:08:55 +0000
3041
@@ -4,8 +4,9 @@
3042
4
(this is enforced by a DB constraint).
4
(this is enforced by a DB constraint).
3043
5
5
3044
6
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
6
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
3047
7
    >>> from canonical.launchpad.interfaces import (
7
    >>> from lp.bugs.interfaces.bug import CreateBugParams
3048
8
    ...     IPersonSet, CreateBugParams, IProductSet)
8
    >>> from lp.registry.interfaces.person import IPersonSet
3049
9
    >>> from lp.registry.interfaces.product import IProductSet
3050
9
    >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
10
    >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
3051
10
    >>> no_priv = getUtility(IPersonSet).getByName('no-priv')
11
    >>> no_priv = getUtility(IPersonSet).getByName('no-priv')
3052
11
    >>> name16 = getUtility(IPersonSet).get(16)
12
    >>> name16 = getUtility(IPersonSet).get(16)
3053
12
13
3054
=== modified file 'lib/lp/bugs/doc/bug-reported-acknowledgement.txt'
3055
--- lib/lp/bugs/doc/bug-reported-acknowledgement.txt	2010-10-09 16:36:22 +0000
3056
+++ lib/lp/bugs/doc/bug-reported-acknowledgement.txt	2010-10-21 19:08:55 +0000
3057
@@ -7,8 +7,9 @@
3058
7
7
3059
8
    >>> login('foo.bar@canonical.com')
8
    >>> login('foo.bar@canonical.com')
3060
9
9
3063
10
    >>> from canonical.launchpad.interfaces import (
10
    >>> from lp.registry.interfaces.distribution import IDistributionSet
3064
11
    ...     IDistributionSet, IProjectGroupSet, IProductSet)
11
    >>> from lp.registry.interfaces.product import IProductSet
3065
12
    >>> from lp.registry.interfaces.projectgroup import IProjectGroupSet
3066
12
13
3067
13
    >>> distribution = getUtility(IDistributionSet).getByName('ubuntu')
14
    >>> distribution = getUtility(IDistributionSet).getByName('ubuntu')
3068
14
    >>> distribution_source_package = (
15
    >>> distribution_source_package = (
3069
15
16
3070
=== modified file 'lib/lp/bugs/doc/bug-reporting-guidelines.txt'
3071
--- lib/lp/bugs/doc/bug-reporting-guidelines.txt	2010-10-09 16:36:22 +0000
3072
+++ lib/lp/bugs/doc/bug-reporting-guidelines.txt	2010-10-21 19:08:55 +0000
3073
@@ -6,8 +6,9 @@
3074
6
6
3075
7
    >>> login('foo.bar@canonical.com')
7
    >>> login('foo.bar@canonical.com')
3076
8
8
3079
9
    >>> from canonical.launchpad.interfaces import (
9
    >>> from lp.registry.interfaces.distribution import IDistributionSet
3080
10
    ...     IDistributionSet, IProjectGroupSet, IProductSet)
10
    >>> from lp.registry.interfaces.product import IProductSet
3081
11
    >>> from lp.registry.interfaces.projectgroup import IProjectGroupSet
3082
11
12
3083
12
    >>> distribution = getUtility(IDistributionSet).getByName('ubuntu')
13
    >>> distribution = getUtility(IDistributionSet).getByName('ubuntu')
3084
13
    >>> distribution_source_package = (
14
    >>> distribution_source_package = (
3085
14
15
3086
=== modified file 'lib/lp/bugs/doc/bug-set-status.txt'
3087
--- lib/lp/bugs/doc/bug-set-status.txt	2010-10-09 16:36:22 +0000
3088
+++ lib/lp/bugs/doc/bug-set-status.txt	2010-10-21 19:08:55 +0000
3089
@@ -10,9 +10,9 @@
3090
10
    >>> login('no-priv@canonical.com')
10
    >>> login('no-priv@canonical.com')
3091
11
    >>> no_priv = getUtility(IPersonSet).getByName('no-priv')
11
    >>> no_priv = getUtility(IPersonSet).getByName('no-priv')
3092
12
12
3095
13
    >>> from canonical.launchpad.interfaces import (
13
    >>> from lp.bugs.interfaces.bug import CreateBugParams
3094
14
    ...     CreateBugParams, IProductSet)
3096
15
    >>> from lp.bugs.interfaces.bugtask import BugTaskStatus
14
    >>> from lp.bugs.interfaces.bugtask import BugTaskStatus
3097
15
    >>> from lp.registry.interfaces.product import IProductSet
3098
16
    >>> bug_params = CreateBugParams(
16
    >>> bug_params = CreateBugParams(
3099
17
    ...     owner=no_priv, title='Sample bug', comment='This is a sample bug.')
17
    ...     owner=no_priv, title='Sample bug', comment='This is a sample bug.')
3100
18
    >>> firefox = getUtility(IProductSet).getByName('firefox')
18
    >>> firefox = getUtility(IProductSet).getByName('firefox')
3101
19
19
3102
=== modified file 'lib/lp/bugs/doc/bug-tags.txt'
3103
--- lib/lp/bugs/doc/bug-tags.txt	2010-10-11 16:17:45 +0000
3104
+++ lib/lp/bugs/doc/bug-tags.txt	2010-10-21 19:08:55 +0000
3105
@@ -67,9 +67,9 @@
3106
67
To make it easy editing the tags as a space separated text string, we
67
To make it easy editing the tags as a space separated text string, we
3107
68
use BugTagsWidget.
68
use BugTagsWidget.
3108
69
69
3109
70
    >>> from lp.bugs.interfaces.bug import IBug
3110
71
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
70
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
3111
72
    >>> from canonical.widgets.bug import BugTagsWidget
71
    >>> from canonical.widgets.bug import BugTagsWidget
3112
72
    >>> from lp.bugs.interfaces.bug import IBug
3113
73
    >>> bug_tags_field = IBug['tags'].bind(bug_one)
73
    >>> bug_tags_field = IBug['tags'].bind(bug_one)
3114
74
    >>> tag_field = bug_tags_field.value_type
74
    >>> tag_field = bug_tags_field.value_type
3115
75
    >>> request = LaunchpadTestRequest()
75
    >>> request = LaunchpadTestRequest()
3116
@@ -178,9 +178,9 @@
3117
178
178
3118
179
We can search for bugs with some specific tag.
179
We can search for bugs with some specific tag.
3119
180
180
3120
181
    >>> from canonical.launchpad.interfaces import (
3121
182
    ...     BugTaskSearchParams, IDistributionSet)
3122
183
    >>> from canonical.launchpad.searchbuilder import all
181
    >>> from canonical.launchpad.searchbuilder import all
3123
182
    >>> from lp.bugs.interfaces.bugtask import BugTaskSearchParams
3124
183
    >>> from lp.registry.interfaces.distribution import IDistributionSet
3125
184
    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
184
    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
3126
185
    >>> svg_tasks = ubuntu.searchTasks(
185
    >>> svg_tasks = ubuntu.searchTasks(
3127
186
    ...     BugTaskSearchParams(tag=all(u'svg'), user=None))
186
    ...     BugTaskSearchParams(tag=all(u'svg'), user=None))
3128
187
187
3129
=== modified file 'lib/lp/bugs/doc/bug.txt'
3130
--- lib/lp/bugs/doc/bug.txt	2010-08-30 05:19:46 +0000
3131
+++ lib/lp/bugs/doc/bug.txt	2010-10-21 19:08:55 +0000
3132
@@ -313,8 +313,8 @@
3133
313
Note that a search will return all public bugs, omitting bug 14 which is
313
Note that a search will return all public bugs, omitting bug 14 which is
3134
314
private:
314
private:
3135
315
315
3136
316
    >>> from canonical.launchpad.interfaces.lpstorm import IStore
3137
316
    >>> from lp.bugs.model.bug import Bug
317
    >>> from lp.bugs.model.bug import Bug
3138
317
    >>> from canonical.launchpad.interfaces.lpstorm import IStore
3139
318
    >>> all_bugs = set(IStore(Bug).find(Bug).values(Bug.id))
318
    >>> all_bugs = set(IStore(Bug).find(Bug).values(Bug.id))
3140
319
319
3141
320
    >>> def hidden_bugs():
320
    >>> def hidden_bugs():
3142
321
321
3143
=== modified file 'lib/lp/bugs/doc/bugactivity.txt'
3144
--- lib/lp/bugs/doc/bugactivity.txt	2010-10-09 16:36:22 +0000
3145
+++ lib/lp/bugs/doc/bugactivity.txt	2010-10-21 19:08:55 +0000
3146
@@ -22,9 +22,13 @@
3147
22
    >>> from zope.event import notify
22
    >>> from zope.event import notify
3148
23
    >>> from lazr.lifecycle.event import (
23
    >>> from lazr.lifecycle.event import (
3149
24
    ...     ObjectCreatedEvent, ObjectModifiedEvent)
24
    ...     ObjectCreatedEvent, ObjectModifiedEvent)
3150
25
    >>> from canonical.launchpad.interfaces import (
3151
26
    ...     IUpstreamBugTask, IDistroBugTask, IProductSet, IBugTaskSet)
3152
27
    >>> from lazr.lifecycle.snapshot import Snapshot
25
    >>> from lazr.lifecycle.snapshot import Snapshot
3153
26
    >>> from lp.bugs.interfaces.bugtask import (
3154
27
    ...     IBugTaskSet,
3155
28
    ...     IDistroBugTask,
3156
29
    ...     IUpstreamBugTask,
3157
30
    ...     )
3158
31
    >>> from lp.registry.interfaces.product import IProductSet
3159
28
    >>> user = getUtility(ILaunchBag).user
32
    >>> user = getUtility(ILaunchBag).user
3160
29
33
3161
30
34
3162
@@ -67,8 +71,8 @@
3163
67
71
3164
68
    >>> from lazr.lifecycle.snapshot import Snapshot
72
    >>> from lazr.lifecycle.snapshot import Snapshot
3165
69
    >>> from lp.bugs.interfaces.bugtask import BugTaskStatus
73
    >>> from lp.bugs.interfaces.bugtask import BugTaskStatus
3168
70
    >>> from canonical.launchpad.interfaces import (
74
    >>> from lp.registry.interfaces.distribution import IDistributionSet
3169
71
    ...     ISourcePackageNameSet, IDistributionSet)
75
    >>> from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
3170
72
    >>> mozilla_firefox = getUtility(ISourcePackageNameSet)['mozilla-firefox']
76
    >>> mozilla_firefox = getUtility(ISourcePackageNameSet)['mozilla-firefox']
3171
73
    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
77
    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
3172
74
    >>> source_package_assignment = getUtility(IBugTaskSet).createTask(
78
    >>> source_package_assignment = getUtility(IBugTaskSet).createTask(
3173
75
79
3174
=== modified file 'lib/lp/bugs/doc/bugattachments.txt'
3175
--- lib/lp/bugs/doc/bugattachments.txt	2010-10-03 15:30:06 +0000
3176
+++ lib/lp/bugs/doc/bugattachments.txt	2010-10-21 19:08:55 +0000
3177
@@ -10,8 +10,10 @@
3178
10
    >>> from canonical.launchpad.ftests import login
10
    >>> from canonical.launchpad.ftests import login
3179
11
    >>> login("foo.bar@canonical.com")
11
    >>> login("foo.bar@canonical.com")
3180
12
12
3183
13
    >>> from canonical.launchpad.interfaces import (
13
    >>> from canonical.launchpad.interfaces.message import IMessageSet
3184
14
    ...     IBugAttachment, IBugSet, IMessageSet, IPersonSet)
14
    >>> from lp.bugs.interfaces.bug import IBugSet
3185
15
    >>> from lp.bugs.interfaces.bugattachment import IBugAttachment
3186
16
    >>> from lp.registry.interfaces.person import IPersonSet
3187
15
    >>> bugset = getUtility(IBugSet)
17
    >>> bugset = getUtility(IBugSet)
3188
16
    >>> bug_one = bugset.get(1)
18
    >>> bug_one = bugset.get(1)
3189
17
    >>> bug_one.attachments.count()
19
    >>> bug_one.attachments.count()
3190
@@ -382,8 +384,11 @@
3191
382
384
3192
383
We can search for attachment of a specific types:
385
We can search for attachment of a specific types:
3193
384
386
3196
385
    >>> from canonical.launchpad.interfaces import (
387
    >>> from lp.bugs.interfaces.bugattachment import BugAttachmentType
3197
386
    ...     BugAttachmentType, BugTaskSearchParams, IBugTaskSet)
388
    >>> from lp.bugs.interfaces.bugtask import (
3198
389
    ...     BugTaskSearchParams,
3199
390
    ...     IBugTaskSet,
3200
391
    ...     )
3201
387
    >>> bugtaskset = getUtility(IBugTaskSet)
392
    >>> bugtaskset = getUtility(IBugTaskSet)
3202
388
    >>> attachmenttype = BugAttachmentType.UNSPECIFIED
393
    >>> attachmenttype = BugAttachmentType.UNSPECIFIED
3203
389
    >>> params = BugTaskSearchParams(attachmenttype=attachmenttype, user=None)
394
    >>> params = BugTaskSearchParams(attachmenttype=attachmenttype, user=None)
3204
390
395
3205
=== modified file 'lib/lp/bugs/doc/bugcomment.txt'
3206
--- lib/lp/bugs/doc/bugcomment.txt	2010-10-14 18:42:19 +0000
3207
+++ lib/lp/bugs/doc/bugcomment.txt	2010-10-21 19:08:55 +0000
3208
@@ -5,8 +5,8 @@
3209
5
independently.
5
independently.
3210
6
6
3211
7
    >>> from zope.component import getMultiAdapter
7
    >>> from zope.component import getMultiAdapter
3212
8
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
3213
8
    >>> from lp.bugs.interfaces.bug import IBugSet
9
    >>> from lp.bugs.interfaces.bug import IBugSet
3214
9
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
3215
10
10
3216
11
11
3217
12
== Handling of the bug's first comment ==
12
== Handling of the bug's first comment ==
3218
13
13
3219
=== modified file 'lib/lp/bugs/doc/bugmessage-visibility.txt'
3220
--- lib/lp/bugs/doc/bugmessage-visibility.txt	2010-10-09 16:36:22 +0000
3221
+++ lib/lp/bugs/doc/bugmessage-visibility.txt	2010-10-21 19:08:55 +0000
3222
@@ -6,8 +6,8 @@
3223
6
A bug message has a visible field, which is True by default.
6
A bug message has a visible field, which is True by default.
3224
7
7
3225
8
    # Setup for creating a new message
8
    # Setup for creating a new message
3226
9
    >>> from lp.bugs.interfaces.bug import IBugSet
3227
9
    >>> from lp.bugs.interfaces.bugmessage import IBugMessageSet
10
    >>> from lp.bugs.interfaces.bugmessage import IBugMessageSet
3228
10
    >>> from lp.bugs.interfaces.bug import IBugSet
3229
11
    >>> from lp.registry.interfaces.person import IPersonSet
11
    >>> from lp.registry.interfaces.person import IPersonSet
3230
12
12
3231
13
    >>> bugmessageset = getUtility(IBugMessageSet)
13
    >>> bugmessageset = getUtility(IBugMessageSet)
3232
14
14
3233
=== modified file 'lib/lp/bugs/doc/bugnotification-email.txt'
3234
--- lib/lp/bugs/doc/bugnotification-email.txt	2010-10-09 16:36:22 +0000
3235
+++ lib/lp/bugs/doc/bugnotification-email.txt	2010-10-21 19:08:55 +0000
3236
@@ -28,9 +28,13 @@
3237
28
examples that follow:
28
examples that follow:
3238
29
29
3239
30
    >>> from zope.component import getUtility
30
    >>> from zope.component import getUtility
3242
31
    >>> from canonical.launchpad.interfaces import (
31
    >>> from canonical.launchpad.interfaces.emailaddress import IEmailAddressSet
3241
32
    ...     IBugDelta, IBugSet, IEmailAddressSet, IPersonSet)
3243
33
    >>> from lp.bugs.adapters.bugdelta import BugDelta
32
    >>> from lp.bugs.adapters.bugdelta import BugDelta
3244
33
    >>> from lp.bugs.interfaces.bug import (
3245
34
    ...     IBugDelta,
3246
35
    ...     IBugSet,
3247
36
    ...     )
3248
37
    >>> from lp.registry.interfaces.person import IPersonSet
3249
34
38
3250
35
= Filing a bug =
39
= Filing a bug =
3251
36
40
3252
@@ -280,10 +284,13 @@
3253
280
284
3254
281
We use a BugTaskDelta to represent changes to a BugTask.
285
We use a BugTaskDelta to represent changes to a BugTask.
3255
282
286
3258
283
    >>> from canonical.launchpad.interfaces import (
287
    >>> from canonical.launchpad.webapp.testing import verifyObject
3259
284
    ...     BugTaskStatus, IBugTaskDelta, IBugTaskSet)
288
    >>> from lp.bugs.interfaces.bugtask import (
3260
289
    ...     BugTaskStatus,
3261
290
    ...     IBugTaskDelta,
3262
291
    ...     IBugTaskSet,
3263
292
    ...     )
3264
285
    >>> from lp.bugs.model.bugtask import BugTaskDelta
293
    >>> from lp.bugs.model.bugtask import BugTaskDelta
3265
286
    >>> from canonical.launchpad.webapp.testing import verifyObject
3266
287
    >>> example_bug_task = factory.makeBugTask()
294
    >>> example_bug_task = factory.makeBugTask()
3267
288
    >>> example_delta = BugTaskDelta(example_bug_task)
295
    >>> example_delta = BugTaskDelta(example_bug_task)
3268
289
    >>> verifyObject(IBugTaskDelta, example_delta)
296
    >>> verifyObject(IBugTaskDelta, example_delta)
3269
290
297
3270
=== modified file 'lib/lp/bugs/doc/bugnotification-sending.txt'
3271
--- lib/lp/bugs/doc/bugnotification-sending.txt	2010-10-11 16:17:45 +0000
3272
+++ lib/lp/bugs/doc/bugnotification-sending.txt	2010-10-21 19:08:55 +0000
3273
@@ -54,8 +54,8 @@
3274
54
Anyway, let's start our demonstration by adding a comment to a bug:
54
Anyway, let's start our demonstration by adding a comment to a bug:
3275
55
55
3276
56
    >>> login('test@canonical.com')
56
    >>> login('test@canonical.com')
3277
57
    >>> from canonical.launchpad.interfaces.message import IMessageSet
3278
57
    >>> from lp.bugs.interfaces.bug import IBugSet
58
    >>> from lp.bugs.interfaces.bug import IBugSet
3279
58
    >>> from canonical.launchpad.interfaces.message import IMessageSet
3280
59
    >>> bug_one = getUtility(IBugSet).get(1)
59
    >>> bug_one = getUtility(IBugSet).get(1)
3281
60
    >>> sample_person = getUtility(ILaunchBag).user
60
    >>> sample_person = getUtility(ILaunchBag).user
3282
61
    >>> comment = getUtility(IMessageSet).fromText(
61
    >>> comment = getUtility(IMessageSet).fromText(
3283
@@ -374,8 +374,8 @@
3284
374
374
3285
375
We will also need a fresh new bug.
375
We will also need a fresh new bug.
3286
376
376
3289
377
    >>> from canonical.launchpad.interfaces import (
377
    >>> from lp.bugs.interfaces.bug import CreateBugParams
3290
378
    ...     IDistributionSet, CreateBugParams)
378
    >>> from lp.registry.interfaces.distribution import IDistributionSet
3291
379
    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
379
    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
3292
380
    >>> description = getUtility(IMessageSet).fromText(
380
    >>> description = getUtility(IMessageSet).fromText(
3293
381
    ...     'subject', 'a description of the bug.', sample_person,
381
    ...     'subject', 'a description of the bug.', sample_person,
3294
382
382
3295
=== modified file 'lib/lp/bugs/doc/bugnotification-threading.txt'
3296
--- lib/lp/bugs/doc/bugnotification-threading.txt	2010-10-11 16:17:45 +0000
3297
+++ lib/lp/bugs/doc/bugnotification-threading.txt	2010-10-21 19:08:55 +0000
3298
@@ -9,8 +9,8 @@
3299
9
9
3300
10
Let's add add change notification and see how it works:
10
Let's add add change notification and see how it works:
3301
11
11
3302
12
    >>> from canonical.database.sqlbase import flush_database_updates
3303
12
    >>> from canonical.launchpad.database import MessageSet
13
    >>> from canonical.launchpad.database import MessageSet
3304
13
    >>> from canonical.database.sqlbase import flush_database_updates
3305
14
14
3306
15
    >>> login('test@canonical.com')
15
    >>> login('test@canonical.com')
3307
16
16
3308
17
17
3309
=== modified file 'lib/lp/bugs/doc/bugnotificationrecipients.txt'
3310
--- lib/lp/bugs/doc/bugnotificationrecipients.txt	2010-10-09 16:36:22 +0000
3311
+++ lib/lp/bugs/doc/bugnotificationrecipients.txt	2010-10-21 19:08:55 +0000
3312
@@ -11,16 +11,16 @@
3313
11
action:
11
action:
3314
12
12
3315
13
  >>> from lp.bugs.model.bug import Bug
13
  >>> from lp.bugs.model.bug import Bug
3316
14
  >>> from lp.registry.model.distribution import Distribution
3317
14
  >>> from lp.registry.model.product import Product
15
  >>> from lp.registry.model.product import Product
3318
15
  >>> from lp.registry.model.distribution import Distribution
3319
16
  >>> bug_one = Bug.get(1)
16
  >>> bug_one = Bug.get(1)
3320
17
  >>> recipients = bug_one.getBugNotificationRecipients()
17
  >>> recipients = bug_one.getBugNotificationRecipients()
3321
18
18
3322
19
The instance of BugNotificationRecipients we get back correctly
19
The instance of BugNotificationRecipients we get back correctly
3323
20
implements INotificationRecipientSet:
20
implements INotificationRecipientSet:
3324
21
21
3325
22
  >>> from canonical.launchpad.interfaces.launchpad import INotificationRecipientSet
3326
22
  >>> from canonical.launchpad.webapp.testing import verifyObject
23
  >>> from canonical.launchpad.webapp.testing import verifyObject
3327
23
  >>> from canonical.launchpad.interfaces.launchpad import INotificationRecipientSet
3328
24
  >>> verifyObject(INotificationRecipientSet, recipients)
24
  >>> verifyObject(INotificationRecipientSet, recipients)
3329
25
  True
25
  True
3330
26
26
3331
27
27
3332
=== modified file 'lib/lp/bugs/doc/bugnotifications.txt'
3333
--- lib/lp/bugs/doc/bugnotifications.txt	2010-10-10 15:39:28 +0000
3334
+++ lib/lp/bugs/doc/bugnotifications.txt	2010-10-21 19:08:55 +0000
3335
@@ -26,9 +26,12 @@
3336
26
    >>> from zope.event import notify
26
    >>> from zope.event import notify
3337
27
    >>> from lazr.lifecycle.event import (
27
    >>> from lazr.lifecycle.event import (
3338
28
    ...     ObjectModifiedEvent, ObjectCreatedEvent)
28
    ...     ObjectModifiedEvent, ObjectCreatedEvent)
3342
29
    >>> from canonical.launchpad.interfaces import (
29
    >>> from lp.bugs.interfaces.bug import CreateBugParams
3343
30
    ...     CreateBugParams, IDistributionSet, IDistroSeriesSet, IPersonSet,
30
    >>> from lp.registry.interfaces.distribution import IDistributionSet
3344
31
    ...     IProductSet, ISourcePackageNameSet)
31
    >>> from lp.registry.interfaces.distroseries import IDistroSeriesSet
3345
32
    >>> from lp.registry.interfaces.person import IPersonSet
3346
33
    >>> from lp.registry.interfaces.product import IProductSet
3347
34
    >>> from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
3348
32
35
3349
33
    >>> bug_submitter = getUtility(IPersonSet).get(12)
36
    >>> bug_submitter = getUtility(IPersonSet).get(12)
3350
34
    >>> firefox = getUtility(IProductSet).get(4)
37
    >>> firefox = getUtility(IProductSet).get(4)
3351
@@ -51,8 +54,8 @@
3352
51
54
3353
52
=== Editing a bug report ===
55
=== Editing a bug report ===
3354
53
56
3355
57
    >>> from lazr.lifecycle.snapshot import Snapshot
3356
54
    >>> from lp.bugs.interfaces.bug import IBug
58
    >>> from lp.bugs.interfaces.bug import IBug
3357
55
    >>> from lazr.lifecycle.snapshot import Snapshot
3358
56
    >>> bug_before_modification = Snapshot(firefox_crashes, providing=IBug)
59
    >>> bug_before_modification = Snapshot(firefox_crashes, providing=IBug)
3359
57
    >>> firefox_crashes.description = "a new description"
60
    >>> firefox_crashes.description = "a new description"
3360
58
    >>> firefox_crashes_modified = ObjectModifiedEvent(
61
    >>> firefox_crashes_modified = ObjectModifiedEvent(
3361
@@ -207,9 +210,11 @@
3362
207
Let's demonstrate a notification email where Sample Person marks a
210
Let's demonstrate a notification email where Sample Person marks a
3363
208
task Fixed, and assigns himself to it.
211
task Fixed, and assigns himself to it.
3364
209
212
3365
210
    >>> from canonical.launchpad.interfaces import (
3366
211
    ...     BugTaskStatus, IDistroBugTask)
3367
212
    >>> from lazr.lifecycle.snapshot import Snapshot
213
    >>> from lazr.lifecycle.snapshot import Snapshot
3368
214
    >>> from lp.bugs.interfaces.bugtask import (
3369
215
    ...     BugTaskStatus,
3370
216
    ...     IDistroBugTask,
3371
217
    ...     )
3372
213
218
3373
214
    >>> bugtask_before_modification = Snapshot(
219
    >>> bugtask_before_modification = Snapshot(
3374
215
    ...     firefox_crashes_in_debian, providing=IDistroBugTask)
220
    ...     firefox_crashes_in_debian, providing=IDistroBugTask)
3375
216
221
3376
=== modified file 'lib/lp/bugs/doc/bugsubscription.txt'
3377
--- lib/lp/bugs/doc/bugsubscription.txt	2010-10-15 14:26:57 +0000
3378
+++ lib/lp/bugs/doc/bugsubscription.txt	2010-10-21 19:08:55 +0000
3379
@@ -12,8 +12,8 @@
3380
12
12
3381
13
IBug has a subscriptions attribute:
13
IBug has a subscriptions attribute:
3382
14
14
3383
15
    >>> from zope.component import getUtility
3384
15
    >>> from lp.bugs.interfaces.bug import IBugSet
16
    >>> from lp.bugs.interfaces.bug import IBugSet
3385
16
    >>> from zope.component import getUtility
3386
17
    >>> bugset = getUtility(IBugSet)
17
    >>> bugset = getUtility(IBugSet)
3387
18
    >>> bug = bugset.get(1)
18
    >>> bug = bugset.get(1)
3388
19
    >>> bug.subscriptions.count()
19
    >>> bug.subscriptions.count()
3389
@@ -43,8 +43,10 @@
3390
43
Let's create a new bug to demonstrate how direct and indirect
43
Let's create a new bug to demonstrate how direct and indirect
3391
44
subscriptions work.
44
subscriptions work.
3392
45
45
3395
46
    >>> from canonical.launchpad.interfaces import (
46
    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
3396
47
    ...     IDistributionSet, ILaunchBag, IPersonSet, CreateBugParams)
47
    >>> from lp.bugs.interfaces.bug import CreateBugParams
3397
48
    >>> from lp.registry.interfaces.distribution import IDistributionSet
3398
49
    >>> from lp.registry.interfaces.person import IPersonSet
3399
48
    >>> ubuntu = getUtility(IDistributionSet).getByName("ubuntu")
50
    >>> ubuntu = getUtility(IDistributionSet).getByName("ubuntu")
3400
49
    >>> personset = getUtility(IPersonSet)
51
    >>> personset = getUtility(IPersonSet)
3401
50
52
3402
51
53
3403
=== modified file 'lib/lp/bugs/doc/bugtarget.txt'
3404
--- lib/lp/bugs/doc/bugtarget.txt	2010-10-03 15:30:06 +0000
3405
+++ lib/lp/bugs/doc/bugtarget.txt	2010-10-21 19:08:55 +0000
3406
@@ -12,8 +12,9 @@
3407
12
target (such as in filterable e-mail messages).
12
target (such as in filterable e-mail messages).
3408
13
13
3409
14
    >>> from zope.component import getUtility
14
    >>> from zope.component import getUtility
3412
15
    >>> from canonical.launchpad.interfaces import (
15
    >>> from lp.bugs.interfaces.bugtarget import IBugTarget
3413
16
    ...     IBugTarget, IDistributionSet, IProductSet)
16
    >>> from lp.registry.interfaces.distribution import IDistributionSet
3414
17
    >>> from lp.registry.interfaces.product import IProductSet
3415
17
    >>> distroset = getUtility(IDistributionSet)
18
    >>> distroset = getUtility(IDistributionSet)
3416
18
    >>> debian = distroset.getByName("debian")
19
    >>> debian = distroset.getByName("debian")
3417
19
    >>> debian_firefox = debian.getSourcePackage("mozilla-firefox")
20
    >>> debian_firefox = debian.getSourcePackage("mozilla-firefox")
3418
20
21
3419
=== modified file 'lib/lp/bugs/doc/bugtask-bugwatch-widget.txt'
3420
--- lib/lp/bugs/doc/bugtask-bugwatch-widget.txt	2010-10-09 16:36:22 +0000
3421
+++ lib/lp/bugs/doc/bugtask-bugwatch-widget.txt	2010-10-21 19:08:55 +0000
3422
@@ -19,8 +19,8 @@
3423
19
19
3424
20
Now we can create a widget using a test request:
20
Now we can create a widget using a test request:
3425
21
21
3426
22
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
3427
22
    >>> from canonical.widgets.bugtask import BugTaskBugWatchWidget
23
    >>> from canonical.widgets.bugtask import BugTaskBugWatchWidget
3428
23
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
3429
24
    >>> request = LaunchpadTestRequest()
24
    >>> request = LaunchpadTestRequest()
3430
25
    >>> bugwatch_widget = BugTaskBugWatchWidget(
25
    >>> bugwatch_widget = BugTaskBugWatchWidget(
3431
26
    ...     bugwatch_field, bugwatch_field.vocabulary, request)
26
    ...     bugwatch_field, bugwatch_field.vocabulary, request)
3432
27
27
3433
=== modified file 'lib/lp/bugs/doc/bugtask-expiration.txt'
3434
--- lib/lp/bugs/doc/bugtask-expiration.txt	2010-10-09 16:36:22 +0000
3435
+++ lib/lp/bugs/doc/bugtask-expiration.txt	2010-10-21 19:08:55 +0000
3436
@@ -31,9 +31,11 @@
3437
31
(min_days_old) that the bugtask has been in the unattended Incomplete
31
(min_days_old) that the bugtask has been in the unattended Incomplete
3438
32
status. It also requires specifying the user that is doing the search.
32
status. It also requires specifying the user that is doing the search.
3439
33
33
3440
34
    >>> from lp.bugs.interfaces.bugtask import (
3441
35
    ...     BugTaskStatus,
3442
36
    ...     IBugTaskSet,
3443
37
    ...     )
3444
34
    >>> from storm.store import Store
38
    >>> from storm.store import Store
3445
35
    >>> from canonical.launchpad.interfaces import (
3446
36
    ...     BugTaskStatus, IBugTaskSet)
3447
37
    >>> bugtaskset = getUtility(IBugTaskSet)
39
    >>> bugtaskset = getUtility(IBugTaskSet)
3448
38
40
3449
39
    >>> expirable_bugtasks = bugtaskset.findExpirableBugTasks()
41
    >>> expirable_bugtasks = bugtaskset.findExpirableBugTasks()
3450
@@ -64,8 +66,9 @@
3451
64
can_expire avoid an expensive db, in the case where we can easily tell
66
can_expire avoid an expensive db, in the case where we can easily tell
3452
65
that no bug tasks can be expired.
67
that no bug tasks can be expired.
3453
66
68
3456
67
    >>> from canonical.launchpad.interfaces import (
69
    >>> from lp.registry.interfaces.distribution import IDistributionSet
3457
68
    ...     IDistributionSet, IPersonSet, IProductSet)
70
    >>> from lp.registry.interfaces.person import IPersonSet
3458
71
    >>> from lp.registry.interfaces.product import IProductSet
3459
69
    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
72
    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
3460
70
    >>> jokosher = getUtility(IProductSet).getByName('jokosher')
73
    >>> jokosher = getUtility(IProductSet).getByName('jokosher')
3461
71
    >>> sample_person = getUtility(IPersonSet).getByEmail(
74
    >>> sample_person = getUtility(IPersonSet).getByEmail(
3462
72
75
3463
=== modified file 'lib/lp/bugs/doc/bugtask-find-similar.txt'
3464
--- lib/lp/bugs/doc/bugtask-find-similar.txt	2010-10-09 16:36:22 +0000
3465
+++ lib/lp/bugs/doc/bugtask-find-similar.txt	2010-10-21 19:08:55 +0000
3466
@@ -11,8 +11,9 @@
3467
11
It doesn't make much sense to find bugs similar to an empty string, so
11
It doesn't make much sense to find bugs similar to an empty string, so
3468
12
no results will be returned.
12
no results will be returned.
3469
13
13
3472
14
    >>> from canonical.launchpad.interfaces import (
14
    >>> from lp.bugs.interfaces.bugtask import IBugTaskSet
3473
15
    ...     IBugTaskSet, IPersonSet, IProductSet)
15
    >>> from lp.registry.interfaces.person import IPersonSet
3474
16
    >>> from lp.registry.interfaces.product import IProductSet
3475
16
    >>> firefox = getUtility(IProductSet).getByName('firefox')
17
    >>> firefox = getUtility(IProductSet).getByName('firefox')
3476
17
    >>> sample_person = getUtility(IPersonSet).getByEmail('test@canonical.com')
18
    >>> sample_person = getUtility(IPersonSet).getByEmail('test@canonical.com')
3477
18
    >>> similar_bugs = getUtility(IBugTaskSet).findSimilar(
19
    >>> similar_bugs = getUtility(IBugTaskSet).findSimilar(
3478
@@ -80,8 +81,8 @@
3479
80
the Firefox bug to private, and repeat the search as a user who isn't
81
the Firefox bug to private, and repeat the search as a user who isn't
3480
81
allowed to view it, only the Thunderbird bug will be returned this time.
82
allowed to view it, only the Thunderbird bug will be returned this time.
3481
82
83
3482
84
    >>> from canonical.launchpad.ftests import syncUpdate
3483
83
    >>> from lp.bugs.interfaces.bug import IBugSet
85
    >>> from lp.bugs.interfaces.bug import IBugSet
3484
84
    >>> from canonical.launchpad.ftests import syncUpdate
3485
85
    >>> login('test@canonical.com')
86
    >>> login('test@canonical.com')
3486
86
    >>> firefox_svg_bug = getUtility(IBugSet).get(1)
87
    >>> firefox_svg_bug = getUtility(IBugSet).get(1)
3487
87
    >>> firefox_svg_bug.setPrivate(True, getUtility(ILaunchBag).user)
88
    >>> firefox_svg_bug.setPrivate(True, getUtility(ILaunchBag).user)
3488
88
89
3489
=== modified file 'lib/lp/bugs/doc/bugtask-package-widget.txt'
3490
--- lib/lp/bugs/doc/bugtask-package-widget.txt	2010-10-10 15:39:28 +0000
3491
+++ lib/lp/bugs/doc/bugtask-package-widget.txt	2010-10-21 19:08:55 +0000
3492
@@ -12,9 +12,9 @@
3493
12
to map the package names, we need a distribution, so we give the widget
12
to map the package names, we need a distribution, so we give the widget
3494
13
a distribution task to work with.
13
a distribution task to work with.
3495
14
14
3496
15
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
3497
15
    >>> from lp.bugs.interfaces.bug import IBugSet
16
    >>> from lp.bugs.interfaces.bug import IBugSet
3498
16
    >>> from lp.bugs.interfaces.bugtask import IDistroBugTask
17
    >>> from lp.bugs.interfaces.bugtask import IDistroBugTask
3499
17
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
3500
18
    >>> bug_one = getUtility(IBugSet).get(1)
18
    >>> bug_one = getUtility(IBugSet).get(1)
3501
19
    >>> ubuntu_task = bug_one.bugtasks[-2]
19
    >>> ubuntu_task = bug_one.bugtasks[-2]
3502
20
    >>> ubuntu_task.distribution.name
20
    >>> ubuntu_task.distribution.name
3503
21
21
3504
=== modified file 'lib/lp/bugs/doc/bugtask-retrieval.txt'
3505
--- lib/lp/bugs/doc/bugtask-retrieval.txt	2010-10-03 15:30:06 +0000
3506
+++ lib/lp/bugs/doc/bugtask-retrieval.txt	2010-10-21 19:08:55 +0000
3507
@@ -5,9 +5,11 @@
3508
5
implementation of IBugTaskSet, allowing retrieval of any bug task in
5
implementation of IBugTaskSet, allowing retrieval of any bug task in
3509
6
Launchpad. We'll use this implementation for demonstration purposes:
6
Launchpad. We'll use this implementation for demonstration purposes:
3510
7
7
3511
8
    >>> from canonical.launchpad.interfaces import (
3512
9
    ...     IBugTask, IBugTaskSet)
3513
10
    >>> from lp.app.errors import NotFoundError
8
    >>> from lp.app.errors import NotFoundError
3514
9
    >>> from lp.bugs.interfaces.bugtask import (
3515
10
    ...     IBugTask,
3516
11
    ...     IBugTaskSet,
3517
12
    ...     )
3518
11
    >>> task_set = getUtility(IBugTaskSet)
13
    >>> task_set = getUtility(IBugTaskSet)
3519
12
14
3520
13
15
3521
14
16
3522
=== modified file 'lib/lp/bugs/doc/bugtask-search.txt'
3523
--- lib/lp/bugs/doc/bugtask-search.txt	2010-10-09 16:36:22 +0000
3524
+++ lib/lp/bugs/doc/bugtask-search.txt	2010-10-21 19:08:55 +0000
3525
@@ -4,8 +4,10 @@
3526
4
method, but they all delegate the search to IBugTaskSet.search(). That
4
method, but they all delegate the search to IBugTaskSet.search(). That
3527
5
method accepts a single parameter; an BugTaskSearchParams instance.
5
method accepts a single parameter; an BugTaskSearchParams instance.
3528
6
6
3531
7
    >>> from canonical.launchpad.interfaces import (
7
    >>> from lp.bugs.interfaces.bugtask import (
3532
8
    ...     BugTaskSearchParams, IBugTaskSet)
8
    ...     BugTaskSearchParams,
3533
9
    ...     IBugTaskSet,
3534
10
    ...     )
3535
9
    >>> bugtask_set = getUtility(IBugTaskSet)
11
    >>> bugtask_set = getUtility(IBugTaskSet)
3536
10
    >>> all_public = BugTaskSearchParams(user=None)
12
    >>> all_public = BugTaskSearchParams(user=None)
3537
11
    >>> found_bugtasks = bugtask_set.search(all_public)
13
    >>> found_bugtasks = bugtask_set.search(all_public)
3538
@@ -293,8 +295,10 @@
3539
293
295
3540
294
Add an Ubuntu bugtask for a bug that is confirmed upstream.
296
Add an Ubuntu bugtask for a bug that is confirmed upstream.
3541
295
297
3544
296
    >>> from canonical.launchpad.interfaces import (
298
    >>> from lp.bugs.interfaces.bugtask import (
3545
297
    ...     BugTaskImportance, BugTaskStatus)
299
    ...     BugTaskImportance,
3546
300
    ...     BugTaskStatus,
3547
301
    ...     )
3548
298
    >>> from lp.bugs.tests.test_bugtask_1 import (
302
    >>> from lp.bugs.tests.test_bugtask_1 import (
3549
299
    ...     BugTaskSearchBugsElsewhereTest)
303
    ...     BugTaskSearchBugsElsewhereTest)
3550
300
    >>> def bugTaskInfo(bugtask):
304
    >>> def bugTaskInfo(bugtask):
3551
@@ -736,9 +740,12 @@
3552
736
It's possible to search for bugs with an attachment of a certain type.
740
It's possible to search for bugs with an attachment of a certain type.
3553
737
741
3554
738
    >>> from StringIO import StringIO
742
    >>> from StringIO import StringIO
3558
739
    >>> from canonical.launchpad.interfaces import (
743
    >>> from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
3559
740
    ...     BugAttachmentType, IBugAttachmentSet, ILibraryFileAliasSet,
744
    >>> from canonical.launchpad.interfaces.message import IMessageSet
3560
741
    ...     IMessageSet)
745
    >>> from lp.bugs.interfaces.bugattachment import (
3561
746
    ...     BugAttachmentType,
3562
747
    ...     IBugAttachmentSet,
3563
748
    ...     )
3564
742
    >>> product = factory.makeProduct()
749
    >>> product = factory.makeProduct()
3565
743
    >>> patch_bug = factory.makeBug(
750
    >>> patch_bug = factory.makeBug(
3566
744
    ...     product=product)
751
    ...     product=product)
3567
745
752
3568
=== modified file 'lib/lp/bugs/doc/bugtask-status-workflow.txt'
3569
--- lib/lp/bugs/doc/bugtask-status-workflow.txt	2010-10-09 16:36:22 +0000
3570
+++ lib/lp/bugs/doc/bugtask-status-workflow.txt	2010-10-21 19:08:55 +0000
3571
@@ -11,8 +11,9 @@
3572
11
a new bug to work with:
11
a new bug to work with:
3573
12
12
3574
13
    >>> from zope.component import getUtility
13
    >>> from zope.component import getUtility
3577
14
    >>> from canonical.launchpad.interfaces import (
14
    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
3578
15
    ...     IDistributionSet, ILaunchBag, CreateBugParams)
15
    >>> from lp.bugs.interfaces.bug import CreateBugParams
3579
16
    >>> from lp.registry.interfaces.distribution import IDistributionSet
3580
16
17
3581
17
    >>> login("foo.bar@canonical.com")
18
    >>> login("foo.bar@canonical.com")
3582
18
    >>> foobar = getUtility(ILaunchBag).user
19
    >>> foobar = getUtility(ILaunchBag).user
3583
19
20
3584
=== modified file 'lib/lp/bugs/doc/bugtask.txt'
3585
--- lib/lp/bugs/doc/bugtask.txt	2010-10-10 15:39:28 +0000
3586
+++ lib/lp/bugs/doc/bugtask.txt	2010-10-21 19:08:55 +0000
3587
@@ -41,8 +41,10 @@
3588
41
41
3589
42
Next, we need to grab some values to provide for importance and status.
42
Next, we need to grab some values to provide for importance and status.
3590
43
43
3593
44
    >>> from canonical.launchpad.interfaces import (
44
    >>> from lp.bugs.interfaces.bugtask import (
3594
45
    ...     BugTaskImportance, BugTaskStatus)
45
    ...     BugTaskImportance,
3595
46
    ...     BugTaskStatus,
3596
47
    ...     )
3597
46
    >>> STATUS_NEW = BugTaskStatus.NEW
48
    >>> STATUS_NEW = BugTaskStatus.NEW
3598
47
    >>> STATUS_CONFIRMED = BugTaskStatus.CONFIRMED
49
    >>> STATUS_CONFIRMED = BugTaskStatus.CONFIRMED
3599
48
    >>> STATUS_FIXRELEASED = BugTaskStatus.FIXRELEASED
50
    >>> STATUS_FIXRELEASED = BugTaskStatus.FIXRELEASED
3600
@@ -105,8 +107,8 @@
3601
105
107
3602
106
== Bug Task Targets ==
108
== Bug Task Targets ==
3603
107
109
3604
110
    >>> from lp.registry.interfaces.distributionsourcepackage import IDistributionSourcePackage
3605
108
    >>> from lp.registry.model.distributionsourcepackage import DistributionSourcePackage
111
    >>> from lp.registry.model.distributionsourcepackage import DistributionSourcePackage
3606
109
    >>> from lp.registry.interfaces.distributionsourcepackage import IDistributionSourcePackage
3607
110
112
3608
111
The "target" of an IBugTask can be one of the items in the following
113
The "target" of an IBugTask can be one of the items in the following
3609
112
list.
114
list.
3610
@@ -165,8 +167,8 @@
3611
165
167
3612
166
  * a distroseries sourcepackage
168
  * a distroseries sourcepackage
3613
167
169
3614
170
    >>> from lp.registry.interfaces.sourcepackage import ISourcePackage
3615
168
    >>> from lp.registry.model.sourcepackage import SourcePackage
171
    >>> from lp.registry.model.sourcepackage import SourcePackage
3616
169
    >>> from lp.registry.interfaces.sourcepackage import ISourcePackage
3617
170
    >>> distro_series_sp_task = bugtaskset.get(16)
172
    >>> distro_series_sp_task = bugtaskset.get(16)
3618
171
    >>> expected_target = SourcePackage(
173
    >>> expected_target = SourcePackage(
3619
172
    ...     distroseries=distro_series_sp_task.distroseries,
174
    ...     distroseries=distro_series_sp_task.distroseries,
3620
@@ -825,8 +827,8 @@
3621
825
later on the interaction between privacy and teams (see the section
827
later on the interaction between privacy and teams (see the section
3622
826
entitled _Privacy and Team Awareness_):
828
entitled _Privacy and Team Awareness_):
3623
827
829
3624
830
    >>> from lazr.lifecycle.snapshot import Snapshot
3625
828
    >>> from lp.bugs.interfaces.bug import IBug
831
    >>> from lp.bugs.interfaces.bug import IBug
3626
829
    >>> from lazr.lifecycle.snapshot import Snapshot
3627
830
832
3628
831
    >>> bug_upstream_firefox_no_svg_support = bugtaskset.get(2)
833
    >>> bug_upstream_firefox_no_svg_support = bugtaskset.get(2)
3629
832
834
3630
833
835
3631
=== modified file 'lib/lp/bugs/doc/bugtracker.txt'
3632
--- lib/lp/bugs/doc/bugtracker.txt	2010-10-09 16:36:22 +0000
3633
+++ lib/lp/bugs/doc/bugtracker.txt	2010-10-21 19:08:55 +0000
3634
@@ -139,8 +139,8 @@
3635
139
bugtracker it will use make_bugtracker_name() to generate a name for the
139
bugtracker it will use make_bugtracker_name() to generate a name for the
3636
140
bug tracker.
140
bug tracker.
3637
141
141
3640
142
    >>> from canonical.launchpad.interfaces import (
142
    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
3641
143
    ...     BugTrackerType, IPersonSet)
143
    >>> from lp.registry.interfaces.person import IPersonSet
3642
144
    >>> sample_person = getUtility(IPersonSet).getByEmail(
144
    >>> sample_person = getUtility(IPersonSet).getByEmail(
3643
145
    ...     'test@canonical.com')
145
    ...     'test@canonical.com')
3644
146
    >>> a_bugtracker = bugtracker_set.ensureBugTracker(
146
    >>> a_bugtracker = bugtracker_set.ensureBugTracker(
3645
@@ -325,8 +325,8 @@
3646
325
325
3647
326
We will forge some BugMessage records before trying again:
326
We will forge some BugMessage records before trying again:
3648
327
327
3649
328
    >>> from zope.security.proxy import removeSecurityProxy
3650
328
    >>> from lp.bugs.interfaces.bugmessage import IBugMessageSet
329
    >>> from lp.bugs.interfaces.bugmessage import IBugMessageSet
3651
329
    >>> from zope.security.proxy import removeSecurityProxy
3652
330
330
3653
331
    >>> for num, bug_watch in enumerate(mozilla_bugzilla.watches):
331
    >>> for num, bug_watch in enumerate(mozilla_bugzilla.watches):
3654
332
    ...     bug_message = getUtility(IBugMessageSet).createMessage(
332
    ...     bug_message = getUtility(IBugMessageSet).createMessage(
3655
333
333
3656
=== modified file 'lib/lp/bugs/doc/bugwatch.txt'
3657
--- lib/lp/bugs/doc/bugwatch.txt	2010-10-09 16:36:22 +0000
3658
+++ lib/lp/bugs/doc/bugwatch.txt	2010-10-21 19:08:55 +0000
3659
@@ -59,8 +59,9 @@
3660
59
Watches of Email Address bugtrackers are slightly different: the `url`
59
Watches of Email Address bugtrackers are slightly different: the `url`
3661
60
property is always the same as the bugtracker baseurl property.
60
property is always the same as the bugtracker baseurl property.
3662
61
61
3665
62
    >>> from canonical.launchpad.interfaces import (
62
    >>> from lp.bugs.interfaces.bug import IBugSet
3666
63
    ...     IBugSet, IBugTrackerSet, IPersonSet)
63
    >>> from lp.bugs.interfaces.bugtracker import IBugTrackerSet
3667
64
    >>> from lp.registry.interfaces.person import IPersonSet
3668
64
    >>> bugtrackerset = getUtility(IBugTrackerSet)
65
    >>> bugtrackerset = getUtility(IBugTrackerSet)
3669
65
66
3670
66
    >>> email_bugtracker = bugtrackerset['email']
67
    >>> email_bugtracker = bugtrackerset['email']
3671
@@ -267,8 +268,8 @@
3672
267
    ...         print "%s => %s" % (old_bugtask.importance.title,
268
    ...         print "%s => %s" % (old_bugtask.importance.title,
3673
268
    ...             bugtask.importance.title)
269
    ...             bugtask.importance.title)
3674
269
    >>> from canonical.launchpad.ftests.event import TestEventListener
270
    >>> from canonical.launchpad.ftests.event import TestEventListener
3675
271
    >>> from lazr.lifecycle.interfaces import IObjectModifiedEvent
3676
270
    >>> from lp.bugs.interfaces.bugtask import IBugTask
272
    >>> from lp.bugs.interfaces.bugtask import IBugTask
3677
271
    >>> from lazr.lifecycle.interfaces import IObjectModifiedEvent
3678
272
    >>> event_listener = TestEventListener(
273
    >>> event_listener = TestEventListener(
3679
273
    ...     IBugTask, IObjectModifiedEvent, print_bugtask_modified)
274
    ...     IBugTask, IObjectModifiedEvent, print_bugtask_modified)
3680
274
275
3681
@@ -417,9 +418,13 @@
3682
417
418
3683
418
    >>> from zope.component import getUtility
419
    >>> from zope.component import getUtility
3684
419
    >>> from canonical.database.sqlbase import flush_database_updates
420
    >>> from canonical.database.sqlbase import flush_database_updates
3688
420
    >>> from canonical.launchpad.interfaces import (
421
    >>> from lp.bugs.interfaces.bug import CreateBugParams
3689
421
    ...     CreateBugParams, BugTrackerType, IBugTaskSet,
422
    >>> from lp.bugs.interfaces.bugtask import IBugTaskSet
3690
422
    ...     IBugTrackerSet, IDistributionSet)
423
    >>> from lp.bugs.interfaces.bugtracker import (
3691
424
    ...     BugTrackerType,
3692
425
    ...     IBugTrackerSet,
3693
426
    ...     )
3694
427
    >>> from lp.registry.interfaces.distribution import IDistributionSet
3695
423
428
3696
424
    >>> ubuntu = getUtility(IDistributionSet).get(1)
429
    >>> ubuntu = getUtility(IDistributionSet).get(1)
3697
425
    >>> firefox = ubuntu.getSourcePackage('mozilla-firefox')
430
    >>> firefox = ubuntu.getSourcePackage('mozilla-firefox')
3698
@@ -462,8 +467,8 @@
3699
462
    >>> import transaction
467
    >>> import transaction
3700
463
    >>> from lp.bugs.tests.externalbugtracker import (
468
    >>> from lp.bugs.tests.externalbugtracker import (
3701
464
    ...     TestRoundup)
469
    ...     TestRoundup)
3702
470
    >>> from canonical.launchpad.scripts.logger import FakeLogger
3703
465
    >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
471
    >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
3704
466
    >>> from canonical.launchpad.scripts.logger import FakeLogger
3705
467
    >>> bug_watch_updater = CheckwatchesMaster(transaction, FakeLogger())
472
    >>> bug_watch_updater = CheckwatchesMaster(transaction, FakeLogger())
3706
468
    >>> external_bugtracker = TestRoundup(bug_tracker.baseurl)
473
    >>> external_bugtracker = TestRoundup(bug_tracker.baseurl)
3707
469
    >>> bug_watch_updater.updateBugWatches(external_bugtracker, [bug_watch])
474
    >>> bug_watch_updater.updateBugWatches(external_bugtracker, [bug_watch])
3708
@@ -550,8 +555,8 @@
3709
550
next_check time for the watch will be in the past (or in this case is
555
next_check time for the watch will be in the past (or in this case is
3710
551
now) and therefore it will be checked with the next checkwatches run.
556
now) and therefore it will be checked with the next checkwatches run.
3711
552
557
3712
558
    >>> from datetime import datetime
3713
553
    >>> from pytz import utc
559
    >>> from pytz import utc
3714
554
    >>> from datetime import datetime
3715
555
    >>> schedulable_watch.next_check = datetime.now(utc)
560
    >>> schedulable_watch.next_check = datetime.now(utc)
3716
556
    >>> schedulable_watch.can_be_rescheduled
561
    >>> schedulable_watch.can_be_rescheduled
3717
557
    False
562
    False
3718
558
563
3719
=== modified file 'lib/lp/bugs/doc/bugwidget.txt'
3720
--- lib/lp/bugs/doc/bugwidget.txt	2010-10-09 16:36:22 +0000
3721
+++ lib/lp/bugs/doc/bugwidget.txt	2010-10-21 19:08:55 +0000
3722
@@ -3,8 +3,8 @@
3723
3
The BugWidget converts string bug ids to the corresponding bug object.
3
The BugWidget converts string bug ids to the corresponding bug object.
3724
4
4
3725
5
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
5
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
3726
6
    >>> from canonical.widgets.bug import BugWidget
3727
6
    >>> from lp.services.fields import BugField
7
    >>> from lp.services.fields import BugField
3728
7
    >>> from canonical.widgets.bug import BugWidget
3729
8
    >>> bug_field = BugField(__name__='bug', title=u'Bug')
8
    >>> bug_field = BugField(__name__='bug', title=u'Bug')
3730
9
    >>> request = LaunchpadTestRequest(form={'field.bug': '1'})
9
    >>> request = LaunchpadTestRequest(form={'field.bug': '1'})
3731
10
    >>> bug_widget = BugWidget(bug_field, request)
10
    >>> bug_widget = BugWidget(bug_field, request)
3732
11
11
3733
=== modified file 'lib/lp/bugs/doc/bugzilla-import.txt'
3734
--- lib/lp/bugs/doc/bugzilla-import.txt	2010-10-03 15:30:06 +0000
3735
+++ lib/lp/bugs/doc/bugzilla-import.txt	2010-10-21 19:08:55 +0000
3736
@@ -106,9 +106,10 @@
3737
106
106
3738
107
  >>> from zope.component import getUtility
107
  >>> from zope.component import getUtility
3739
108
  >>> from canonical.launchpad.ftests import login
108
  >>> from canonical.launchpad.ftests import login
3742
109
  >>> from canonical.launchpad.interfaces import (
109
  >>> from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
3743
110
  ...     IBugSet, ILaunchpadCelebrities, IPersonSet)
110
  >>> from lp.bugs.interfaces.bug import IBugSet
3744
111
  >>> from lp.bugs.scripts import bugzilla
111
  >>> from lp.bugs.scripts import bugzilla
3745
112
  >>> from lp.registry.interfaces.person import IPersonSet
3746
112
113
3747
113
Get a reference to the Ubuntu bug tracker, and log in:
114
Get a reference to the Ubuntu bug tracker, and log in:
3748
114
115
3749
115
116
3750
=== modified file 'lib/lp/bugs/doc/checkwatches-batching.txt'
3751
--- lib/lp/bugs/doc/checkwatches-batching.txt	2010-04-21 10:30:24 +0000
3752
+++ lib/lp/bugs/doc/checkwatches-batching.txt	2010-10-21 19:08:55 +0000
3753
@@ -67,9 +67,9 @@
3754
67
For bug watches that have been checked before, the remote system is
67
For bug watches that have been checked before, the remote system is
3755
68
asked which of a list of bugs have been modified since a given date.
68
asked which of a list of bugs have been modified since a given date.
3756
69
69
3757
70
    >>> from zope.security.proxy import removeSecurityProxy
3758
70
    >>> from datetime import datetime
71
    >>> from datetime import datetime
3759
71
    >>> from pytz import UTC
72
    >>> from pytz import UTC
3760
72
    >>> from zope.security.proxy import removeSecurityProxy
3761
73
73
3762
74
    >>> class QueryableRemoteSystem:
74
    >>> class QueryableRemoteSystem:
3763
75
    ...     sync_comments = False
75
    ...     sync_comments = False
3764
76
76
3765
=== modified file 'lib/lp/bugs/doc/checkwatches-cli-switches.txt'
3766
--- lib/lp/bugs/doc/checkwatches-cli-switches.txt	2010-10-04 19:50:45 +0000
3767
+++ lib/lp/bugs/doc/checkwatches-cli-switches.txt	2010-10-21 19:08:55 +0000
3768
@@ -87,8 +87,8 @@
3769
87
87
3770
88
    >>> import pytz
88
    >>> import pytz
3771
89
    >>> from datetime import datetime
89
    >>> from datetime import datetime
3772
90
    >>> from lp.bugs.interfaces.bugtracker import IBugTrackerSet
3773
90
    >>> from lp.testing.factory import LaunchpadObjectFactory
91
    >>> from lp.testing.factory import LaunchpadObjectFactory
3774
91
    >>> from lp.bugs.interfaces.bugtracker import IBugTrackerSet
3775
92
92
3776
93
    >>> factory = LaunchpadObjectFactory()
93
    >>> factory = LaunchpadObjectFactory()
3777
94
    >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
94
    >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
3778
95
95
3779
=== modified file 'lib/lp/bugs/doc/checkwatches.txt'
3780
--- lib/lp/bugs/doc/checkwatches.txt	2010-10-09 16:36:22 +0000
3781
+++ lib/lp/bugs/doc/checkwatches.txt	2010-10-21 19:08:55 +0000
3782
@@ -20,8 +20,8 @@
3783
20
20
3784
21
    >>> from canonical.config import config
21
    >>> from canonical.config import config
3785
22
    >>> from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
22
    >>> from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
3786
23
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
3787
23
    >>> from lp.testing.factory import LaunchpadObjectFactory
24
    >>> from lp.testing.factory import LaunchpadObjectFactory
3788
24
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
3789
25
25
3790
26
    >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
26
    >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
3791
27
27
3792
@@ -104,14 +104,13 @@
3793
104
First, we create some bug watches to test with:
104
First, we create some bug watches to test with:
3794
105
105
3795
106
    >>> from datetime import datetime
106
    >>> from datetime import datetime
3796
107
    >>> from lp.bugs.interfaces.bug import IBugSet
3797
108
    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
3798
109
    >>> from lp.bugs.model.bugtracker import BugTracker
3799
107
    >>> from pytz import utc
110
    >>> from pytz import utc
3800
108
    >>> from lp.bugs.model.bugtracker import BugTracker
3801
109
    >>> from canonical.launchpad.interfaces import (
3802
110
    ...     BugTrackerType, IBugSet)
3803
111
    >>> from lp.bugs.scripts.checkwatches import (
111
    >>> from lp.bugs.scripts.checkwatches import (
3804
112
    ...     CheckwatchesMaster)
112
    ...     CheckwatchesMaster)
3807
113
    >>> from canonical.launchpad.interfaces import (
113
    >>> from lp.registry.interfaces.person import IPersonSet
3806
114
    ...     IPersonSet)
3808
115
    >>> sample_person = getUtility(IPersonSet).getByEmail(
114
    >>> sample_person = getUtility(IPersonSet).getByEmail(
3809
116
    ...     'test@canonical.com')
115
    ...     'test@canonical.com')
3810
117
116
3811
@@ -257,8 +256,8 @@
3812
257
batch size. We will also monkey-patch urllib2.urlopen again so that no
256
batch size. We will also monkey-patch urllib2.urlopen again so that no
3813
258
requests are actually made.
257
requests are actually made.
3814
259
258
3815
260
    >>> from lp.bugs import externalbugtracker
3816
261
    >>> from canonical.launchpad.scripts import FakeLogger
259
    >>> from canonical.launchpad.scripts import FakeLogger
3817
260
    >>> from lp.bugs import externalbugtracker
3818
262
261
3819
263
    >>> transaction.commit()
262
    >>> transaction.commit()
3820
264
    >>> updater = CheckwatchesMaster(transaction.manager)
263
    >>> updater = CheckwatchesMaster(transaction.manager)
3821
265
264
3822
=== modified file 'lib/lp/bugs/doc/displaying-bugs-and-tasks.txt'
3823
--- lib/lp/bugs/doc/displaying-bugs-and-tasks.txt	2010-10-11 16:17:45 +0000
3824
+++ lib/lp/bugs/doc/displaying-bugs-and-tasks.txt	2010-10-21 19:08:55 +0000
3825
@@ -16,8 +16,10 @@
3826
16
  >>> from zope.component import getUtility
16
  >>> from zope.component import getUtility
3827
17
  >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
17
  >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
3828
18
  >>> from lp.bugs.interfaces.bugtask import BugTaskImportance, IBugTaskSet
18
  >>> from lp.bugs.interfaces.bugtask import BugTaskImportance, IBugTaskSet
3831
19
  >>> from canonical.launchpad.ftests import test_tales
19
  >>> from canonical.launchpad.ftests import (
3832
20
  >>> from canonical.launchpad.ftests import login
20
  ...     login,
3833
21
  ...     test_tales,
3834
22
  ...     )
3835
21
23
3836
22
  >>> login("foo.bar@canonical.com")
24
  >>> login("foo.bar@canonical.com")
3837
23
  >>> bugtaskset = getUtility(IBugTaskSet)
25
  >>> bugtaskset = getUtility(IBugTaskSet)
3838
@@ -97,10 +99,10 @@
3839
97
We define a helper that uses the BugTaskListingView class (obtained via
99
We define a helper that uses the BugTaskListingView class (obtained via
3840
98
+listing-view) to render the status:
100
+listing-view) to render the status:
3841
99
101
3842
100
  >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
3843
101
  >>> from lp.bugs.interfaces.bugtask import BugTaskStatus
3844
102
  >>> from zope.component import getMultiAdapter
102
  >>> from zope.component import getMultiAdapter
3845
103
  >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
3846
103
  >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
104
  >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
3847
105
  >>> from lp.bugs.interfaces.bugtask import BugTaskStatus
3848
104
106
3849
105
  >>> def render_bugtask_status(task):
107
  >>> def render_bugtask_status(task):
3850
106
  ...   view = getMultiAdapter(
108
  ...   view = getMultiAdapter(
3851
107
109
3852
=== modified file 'lib/lp/bugs/doc/externalbugtracker-bug-imports.txt'
3853
--- lib/lp/bugs/doc/externalbugtracker-bug-imports.txt	2010-10-09 16:36:22 +0000
3854
+++ lib/lp/bugs/doc/externalbugtracker-bug-imports.txt	2010-10-21 19:08:55 +0000
3855
@@ -24,8 +24,8 @@
3856
24
    ...     def getBugTargetName(self, remote_bug):
24
    ...     def getBugTargetName(self, remote_bug):
3857
25
    ...         return self._bugs[remote_bug]['package']
25
    ...         return self._bugs[remote_bug]['package']
3858
26
26
3861
27
    >>> from canonical.launchpad.interfaces import (
27
    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
3862
28
    ...     BugTrackerType, IDistributionSet)
28
    >>> from lp.registry.interfaces.distribution import IDistributionSet
3863
29
    >>> from lp.bugs.tests.externalbugtracker import (
29
    >>> from lp.bugs.tests.externalbugtracker import (
3864
30
    ...     new_bugtracker)
30
    ...     new_bugtracker)
3865
31
    >>> bugtracker = new_bugtracker(BugTrackerType.BUGZILLA)
31
    >>> bugtracker = new_bugtracker(BugTrackerType.BUGZILLA)
3866
@@ -45,8 +45,8 @@
3867
45
imported into, and the remote bug number. At the moment only
45
imported into, and the remote bug number. At the moment only
3868
46
distributions are supported as the bug target.
46
distributions are supported as the bug target.
3869
47
47
3870
48
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
3871
48
    >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
49
    >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
3872
49
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
3873
50
    >>> debian = getUtility(IDistributionSet).getByName('debian')
50
    >>> debian = getUtility(IDistributionSet).getByName('debian')
3874
51
    >>> external_bugtracker._bugs['3'] =  {
51
    >>> external_bugtracker._bugs['3'] =  {
3875
52
    ...     'package': 'evolution',
52
    ...     'package': 'evolution',
3876
53
53
3877
=== modified file 'lib/lp/bugs/doc/externalbugtracker-bugzilla-api.txt'
3878
--- lib/lp/bugs/doc/externalbugtracker-bugzilla-api.txt	2010-10-15 20:45:24 +0000
3879
+++ lib/lp/bugs/doc/externalbugtracker-bugzilla-api.txt	2010-10-21 19:08:55 +0000
3880
@@ -386,8 +386,8 @@
3881
386
means that we can use it to import comments from the remote Bugzilla
386
means that we can use it to import comments from the remote Bugzilla
3882
387
instance.
387
instance.
3883
388
388
3884
389
    >>> from canonical.launchpad.webapp.testing import verifyObject
3885
389
    >>> from lp.bugs.interfaces.externalbugtracker import ISupportsCommentImport
390
    >>> from lp.bugs.interfaces.externalbugtracker import ISupportsCommentImport
3886
390
    >>> from canonical.launchpad.webapp.testing import verifyObject
3887
391
    >>> verifyObject(ISupportsCommentImport, bugzilla)
391
    >>> verifyObject(ISupportsCommentImport, bugzilla)
3888
392
    True
392
    True
3889
393
393
3890
394
394
3891
=== modified file 'lib/lp/bugs/doc/externalbugtracker-bugzilla-lp-plugin.txt'
3892
--- lib/lp/bugs/doc/externalbugtracker-bugzilla-lp-plugin.txt	2010-10-09 16:36:22 +0000
3893
+++ lib/lp/bugs/doc/externalbugtracker-bugzilla-lp-plugin.txt	2010-10-21 19:08:55 +0000
3894
@@ -334,8 +334,8 @@
3895
334
means that we can use it to import comments from the remote Bugzilla
334
means that we can use it to import comments from the remote Bugzilla
3896
335
instance.
335
instance.
3897
336
336
3898
337
    >>> from canonical.launchpad.webapp.testing import verifyObject
3899
337
    >>> from lp.bugs.interfaces.externalbugtracker import ISupportsCommentImport
338
    >>> from lp.bugs.interfaces.externalbugtracker import ISupportsCommentImport
3900
338
    >>> from canonical.launchpad.webapp.testing import verifyObject
3901
339
    >>> verifyObject(ISupportsCommentImport, bugzilla)
339
    >>> verifyObject(ISupportsCommentImport, bugzilla)
3902
340
    True
340
    True
3903
341
341
3904
342
342
3905
=== modified file 'lib/lp/bugs/doc/externalbugtracker-bugzilla-oddities.txt'
3906
--- lib/lp/bugs/doc/externalbugtracker-bugzilla-oddities.txt	2010-10-09 16:36:22 +0000
3907
+++ lib/lp/bugs/doc/externalbugtracker-bugzilla-oddities.txt	2010-10-21 19:08:55 +0000
3908
@@ -14,9 +14,9 @@
3909
14
14
3910
15
    >>> from lp.bugs.interfaces.bugtracker import IBugTrackerSet
15
    >>> from lp.bugs.interfaces.bugtracker import IBugTrackerSet
3911
16
16
3912
17
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
3913
18
    >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
3914
17
    >>> from lp.bugs.tests.externalbugtracker import TestIssuezilla
19
    >>> from lp.bugs.tests.externalbugtracker import TestIssuezilla
3915
18
    >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
3916
19
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
3917
20
    >>> txn = LaunchpadZopelessLayer.txn
20
    >>> txn = LaunchpadZopelessLayer.txn
3918
21
    >>> mozilla_bugzilla = getUtility(IBugTrackerSet).getByName('mozilla.org')
21
    >>> mozilla_bugzilla = getUtility(IBugTrackerSet).getByName('mozilla.org')
3919
22
    >>> issuezilla = TestIssuezilla(mozilla_bugzilla.baseurl)
22
    >>> issuezilla = TestIssuezilla(mozilla_bugzilla.baseurl)
3920
23
23
3921
=== modified file 'lib/lp/bugs/doc/externalbugtracker-bugzilla.txt'
3922
--- lib/lp/bugs/doc/externalbugtracker-bugzilla.txt	2010-10-09 16:36:22 +0000
3923
+++ lib/lp/bugs/doc/externalbugtracker-bugzilla.txt	2010-10-21 19:08:55 +0000
3924
@@ -58,8 +58,8 @@
3925
58
Since we don't want to depend on a working network connection, we use a
58
Since we don't want to depend on a working network connection, we use a
3926
59
slightly modified implementation.
59
slightly modified implementation.
3927
60
60
3928
61
    >>> from lp.bugs.interfaces.bugtracker import IBugTrackerSet
3929
61
    >>> from lp.bugs.tests.externalbugtracker import TestBugzilla
62
    >>> from lp.bugs.tests.externalbugtracker import TestBugzilla
3930
62
    >>> from lp.bugs.interfaces.bugtracker import IBugTrackerSet
3931
63
    >>> gnome_bugzilla = (
63
    >>> gnome_bugzilla = (
3932
64
    ...     getUtility(IBugTrackerSet).getByName('gnome-bugzilla'))
64
    ...     getUtility(IBugTrackerSet).getByName('gnome-bugzilla'))
3933
65
    >>> external_bugzilla = TestBugzilla(gnome_bugzilla.baseurl)
65
    >>> external_bugzilla = TestBugzilla(gnome_bugzilla.baseurl)
3934
@@ -430,8 +430,9 @@
3935
430
430
3936
431
Let's add a handful of watches:
431
Let's add a handful of watches:
3937
432
432
3940
433
    >>> from canonical.launchpad.interfaces import (
433
    >>> from lp.bugs.interfaces.bug import IBugSet
3941
434
    ...     IBugSet, IBugWatchSet, IPersonSet)
434
    >>> from lp.bugs.interfaces.bugwatch import IBugWatchSet
3942
435
    >>> from lp.registry.interfaces.person import IPersonSet
3943
435
    >>> sample_person = getUtility(IPersonSet).getByEmail(
436
    >>> sample_person = getUtility(IPersonSet).getByEmail(
3944
436
    ...     'test@canonical.com')
437
    ...     'test@canonical.com')
3945
437
    >>> bug_one = getUtility(IBugSet).get(1)
438
    >>> bug_one = getUtility(IBugSet).get(1)
3946
438
439
3947
=== modified file 'lib/lp/bugs/doc/externalbugtracker-comment-imports.txt'
3948
--- lib/lp/bugs/doc/externalbugtracker-comment-imports.txt	2010-10-04 19:50:45 +0000
3949
+++ lib/lp/bugs/doc/externalbugtracker-comment-imports.txt	2010-10-21 19:08:55 +0000
3950
@@ -10,10 +10,14 @@
3951
10
    >>> from canonical.config import config
10
    >>> from canonical.config import config
3952
11
    >>> from lp.bugs.tests.externalbugtracker import (
11
    >>> from lp.bugs.tests.externalbugtracker import (
3953
12
    ...     new_bugtracker)
12
    ...     new_bugtracker)
3957
13
    >>> from canonical.launchpad.interfaces import (
13
    >>> from canonical.launchpad.interfaces.message import IMessageSet
3955
14
    ...     BugTrackerType, CreateBugParams, IBugMessageSet,
3956
15
    ...     IBugWatchSet, IMessageSet, IPersonSet, IProductSet)
3958
16
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
14
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
3959
15
    >>> from lp.bugs.interfaces.bug import CreateBugParams
3960
16
    >>> from lp.bugs.interfaces.bugmessage import IBugMessageSet
3961
17
    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
3962
18
    >>> from lp.bugs.interfaces.bugwatch import IBugWatchSet
3963
19
    >>> from lp.registry.interfaces.person import IPersonSet
3964
20
    >>> from lp.registry.interfaces.product import IProductSet
3965
17
21
3966
18
    >>> bug_tracker = new_bugtracker(BugTrackerType.BUGZILLA)
22
    >>> bug_tracker = new_bugtracker(BugTrackerType.BUGZILLA)
3967
19
23
3968
@@ -41,8 +45,7 @@
3969
41
45
3970
42
    >>> from lp.bugs.externalbugtracker import (
46
    >>> from lp.bugs.externalbugtracker import (
3971
43
    ...     ExternalBugTracker)
47
    ...     ExternalBugTracker)
3974
44
    >>> from canonical.launchpad.interfaces import (
48
    >>> from lp.bugs.interfaces.externalbugtracker import ISupportsCommentImport
3973
45
    ...     ISupportsCommentImport)
3975
46
    >>> class CommentImportingExternalBugTracker(ExternalBugTracker):
49
    >>> class CommentImportingExternalBugTracker(ExternalBugTracker):
3976
47
    ...     implements(ISupportsCommentImport)
50
    ...     implements(ISupportsCommentImport)
3977
48
    ...
51
    ...
3978
49
52
3979
=== modified file 'lib/lp/bugs/doc/externalbugtracker-comment-pushing.txt'
3980
--- lib/lp/bugs/doc/externalbugtracker-comment-pushing.txt	2010-10-04 19:50:45 +0000
3981
+++ lib/lp/bugs/doc/externalbugtracker-comment-pushing.txt	2010-10-21 19:08:55 +0000
3982
@@ -10,10 +10,14 @@
3983
10
    >>> from canonical.config import config
10
    >>> from canonical.config import config
3984
11
    >>> from lp.bugs.tests.externalbugtracker import (
11
    >>> from lp.bugs.tests.externalbugtracker import (
3985
12
    ...     new_bugtracker)
12
    ...     new_bugtracker)
3989
13
    >>> from canonical.launchpad.interfaces import (
13
    >>> from canonical.launchpad.interfaces.message import IMessageSet
3987
14
    ...     BugTrackerType, CreateBugParams, IBugMessageSet,
3988
15
    ...     IBugWatchSet, IMessageSet, IPersonSet, IProductSet)
3990
16
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
14
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
3991
15
    >>> from lp.bugs.interfaces.bug import CreateBugParams
3992
16
    >>> from lp.bugs.interfaces.bugmessage import IBugMessageSet
3993
17
    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
3994
18
    >>> from lp.bugs.interfaces.bugwatch import IBugWatchSet
3995
19
    >>> from lp.registry.interfaces.person import IPersonSet
3996
20
    >>> from lp.registry.interfaces.product import IProductSet
3997
17
21
3998
18
    >>> bug_tracker = new_bugtracker(BugTrackerType.TRAC)
22
    >>> bug_tracker = new_bugtracker(BugTrackerType.TRAC)
3999
19
23
4000
@@ -46,8 +50,7 @@
4001
46
an example ExternalBugTracker that implements the
50
an example ExternalBugTracker that implements the
4002
47
ISupportsCommentPushing interface.
51
ISupportsCommentPushing interface.
4003
48
52
4006
49
    >>> from canonical.launchpad.interfaces import (
53
    >>> from lp.bugs.interfaces.externalbugtracker import ISupportsCommentPushing
4005
50
    ...     ISupportsCommentPushing)
4007
51
    >>> from lp.bugs.externalbugtracker import (
54
    >>> from lp.bugs.externalbugtracker import (
4008
52
    ...     ExternalBugTracker)
55
    ...     ExternalBugTracker)
4009
53
56
4010
@@ -187,8 +190,7 @@
4011
187
from the remote bugtracker. To demonstrate this, we need to create an
190
from the remote bugtracker. To demonstrate this, we need to create an
4012
188
example ExternalBugTracker that does comment importing.
191
example ExternalBugTracker that does comment importing.
4013
189
192
4016
190
    >>> from canonical.launchpad.interfaces import (
193
    >>> from lp.bugs.interfaces.externalbugtracker import ISupportsCommentImport
4015
191
    ...     ISupportsCommentImport)
4017
192
    >>> class CommentImportingExternalBugTracker(
194
    >>> class CommentImportingExternalBugTracker(
4018
193
    ...     CommentPushingExternalBugTracker):
195
    ...     CommentPushingExternalBugTracker):
4019
194
    ...     implements(ISupportsCommentImport)
196
    ...     implements(ISupportsCommentImport)
4020
195
197
4021
=== modified file 'lib/lp/bugs/doc/externalbugtracker-debbugs.txt'
4022
--- lib/lp/bugs/doc/externalbugtracker-debbugs.txt	2010-10-11 16:17:45 +0000
4023
+++ lib/lp/bugs/doc/externalbugtracker-debbugs.txt	2010-10-21 19:08:55 +0000
4024
@@ -6,8 +6,8 @@
4025
6
test:
6
test:
4026
7
7
4027
8
    >>> import os.path
8
    >>> import os.path
4028
9
    >>> from canonical.config import config
4029
9
    >>> from canonical.launchpad.components.ftests import __file__
10
    >>> from canonical.launchpad.components.ftests import __file__
4030
10
    >>> from canonical.config import config
4031
11
    >>> test_db_location = os.path.join(
11
    >>> test_db_location = os.path.join(
4032
12
    ...     os.path.dirname(__file__), 'debbugs_db')
12
    ...     os.path.dirname(__file__), 'debbugs_db')
4033
13
13
4034
@@ -348,8 +348,8 @@
4035
348
348
4036
349
    >>> from lp.bugs.externalbugtracker import (
349
    >>> from lp.bugs.externalbugtracker import (
4037
350
    ...     get_external_bugtracker)
350
    ...     get_external_bugtracker)
4040
351
    >>> from canonical.launchpad.interfaces import (
351
    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
4041
352
    ...     BugTrackerType, ISupportsCommentImport)
352
    >>> from lp.bugs.interfaces.externalbugtracker import ISupportsCommentImport
4042
353
    >>> from lp.bugs.tests.externalbugtracker import (
353
    >>> from lp.bugs.tests.externalbugtracker import (
4043
354
    ...     new_bugtracker)
354
    ...     new_bugtracker)
4044
355
    >>> external_debbugs = get_external_bugtracker(
355
    >>> external_debbugs = get_external_bugtracker(
4045
@@ -438,8 +438,10 @@
4046
438
Message. It requires a Person instance to be used as the Message's
438
Message. It requires a Person instance to be used as the Message's
4047
439
owner, so we'll turn Teun Vink into a Person.
439
owner, so we'll turn Teun Vink into a Person.
4048
440
440
4051
441
    >>> from canonical.launchpad.interfaces import (
441
    >>> from lp.registry.interfaces.person import (
4052
442
    ...     IPersonSet, PersonCreationRationale)
442
    ...     IPersonSet,
4053
443
    ...     PersonCreationRationale,
4054
444
    ...     )
4055
443
    >>> poster = getUtility(IPersonSet).ensurePerson(
445
    >>> poster = getUtility(IPersonSet).ensurePerson(
4056
444
    ...     poster_email, poster_name, PersonCreationRationale.BUGIMPORT,
446
    ...     poster_email, poster_name, PersonCreationRationale.BUGIMPORT,
4057
445
    ...     comment='when importing comments for %s.' % bug_watch.title)
447
    ...     comment='when importing comments for %s.' % bug_watch.title)
4058
446
448
4059
=== modified file 'lib/lp/bugs/doc/externalbugtracker-emailaddress.txt'
4060
--- lib/lp/bugs/doc/externalbugtracker-emailaddress.txt	2010-10-09 16:36:22 +0000
4061
+++ lib/lp/bugs/doc/externalbugtracker-emailaddress.txt	2010-10-21 19:08:55 +0000
4062
@@ -33,8 +33,11 @@
4063
33
33
4064
34
    >>> from zope.component import getUtility
34
    >>> from zope.component import getUtility
4065
35
    >>> from canonical.launchpad.webapp.testing import verifyObject
35
    >>> from canonical.launchpad.webapp.testing import verifyObject
4068
36
    >>> from canonical.launchpad.interfaces import (
36
    >>> from lp.bugs.interfaces.bugtracker import (
4069
37
    ...     IBugTracker, IBugTrackerSet, IPersonSet)
37
    ...     IBugTracker,
4070
38
    ...     IBugTrackerSet,
4071
39
    ...     )
4072
40
    >>> from lp.registry.interfaces.person import IPersonSet
4073
38
41
4074
39
    >>> sample_person = getUtility(IPersonSet).getByEmail(
42
    >>> sample_person = getUtility(IPersonSet).getByEmail(
4075
40
    ...     'test@canonical.com')
43
    ...     'test@canonical.com')
4076
41
44
4077
=== modified file 'lib/lp/bugs/doc/externalbugtracker-mantis-csv.txt'
4078
--- lib/lp/bugs/doc/externalbugtracker-mantis-csv.txt	2010-10-11 16:17:45 +0000
4079
+++ lib/lp/bugs/doc/externalbugtracker-mantis-csv.txt	2010-10-21 19:08:55 +0000
4080
@@ -53,8 +53,8 @@
4081
53
53
4082
54
    >>> sample_person = getUtility(IPersonSet).getByEmail('test@canonical.com')
54
    >>> sample_person = getUtility(IPersonSet).getByEmail('test@canonical.com')
4083
55
55
4084
56
    >>> from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
4085
56
    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
57
    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
4086
57
    >>> from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
4087
58
    >>> from lp.bugs.tests.externalbugtracker import (
58
    >>> from lp.bugs.tests.externalbugtracker import (
4088
59
    ...     new_bugtracker)
59
    ...     new_bugtracker)
4089
60
    >>> example_bug_tracker = new_bugtracker(BugTrackerType.MANTIS)
60
    >>> example_bug_tracker = new_bugtracker(BugTrackerType.MANTIS)
4090
61
61
4091
=== modified file 'lib/lp/bugs/doc/externalbugtracker-mantis.txt'
4092
--- lib/lp/bugs/doc/externalbugtracker-mantis.txt	2010-10-11 16:17:45 +0000
4093
+++ lib/lp/bugs/doc/externalbugtracker-mantis.txt	2010-10-21 19:08:55 +0000
4094
@@ -13,9 +13,9 @@
4095
13
    >>> from lp.bugs.externalbugtracker import Mantis
13
    >>> from lp.bugs.externalbugtracker import Mantis
4096
14
    >>> from lp.bugs.tests.externalbugtracker import (
14
    >>> from lp.bugs.tests.externalbugtracker import (
4097
15
    ...     new_bugtracker)
15
    ...     new_bugtracker)
4098
16
    >>> from canonical.launchpad.interfaces import (
4099
17
    ...     BugTrackerType, IExternalBugTracker)
4100
18
    >>> from canonical.launchpad.webapp.testing import verifyObject
16
    >>> from canonical.launchpad.webapp.testing import verifyObject
4101
17
    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
4102
18
    >>> from lp.bugs.interfaces.externalbugtracker import IExternalBugTracker
4103
19
    >>> alsa_mantis = Mantis('http://example.com/')
19
    >>> alsa_mantis = Mantis('http://example.com/')
4104
20
20
4105
21
    >>> verifyObject(IExternalBugTracker, alsa_mantis)
21
    >>> verifyObject(IExternalBugTracker, alsa_mantis)
4106
@@ -80,8 +80,8 @@
4107
80
80
4108
81
    >>> transaction.commit()
81
    >>> transaction.commit()
4109
82
82
4110
83
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
4111
83
    >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
84
    >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
4112
84
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
4113
85
    >>> txn = LaunchpadZopelessLayer.txn
85
    >>> txn = LaunchpadZopelessLayer.txn
4114
86
    >>> bug_watch_updater = CheckwatchesMaster(txn)
86
    >>> bug_watch_updater = CheckwatchesMaster(txn)
4115
87
    >>> bug_watch_updater.updateBugWatches(
87
    >>> bug_watch_updater.updateBugWatches(
4116
88
88
4117
=== modified file 'lib/lp/bugs/doc/externalbugtracker-roundup.txt'
4118
--- lib/lp/bugs/doc/externalbugtracker-roundup.txt	2010-10-11 16:17:45 +0000
4119
+++ lib/lp/bugs/doc/externalbugtracker-roundup.txt	2010-10-21 19:08:55 +0000
4120
@@ -11,8 +11,8 @@
4121
11
implements IExternalBugTracker.
11
implements IExternalBugTracker.
4122
12
12
4123
13
    >>> from lp.bugs.externalbugtracker import Roundup
13
    >>> from lp.bugs.externalbugtracker import Roundup
4126
14
    >>> from canonical.launchpad.interfaces import (
14
    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
4127
15
    ...     BugTrackerType, IExternalBugTracker)
15
    >>> from lp.bugs.interfaces.externalbugtracker import IExternalBugTracker
4128
16
    >>> from lp.bugs.tests.externalbugtracker import (
16
    >>> from lp.bugs.tests.externalbugtracker import (
4129
17
    ...     new_bugtracker)
17
    ...     new_bugtracker)
4130
18
    >>> from canonical.launchpad.webapp.testing import verifyObject
18
    >>> from canonical.launchpad.webapp.testing import verifyObject
4131
@@ -138,8 +138,8 @@
4132
138
138
4133
139
    >>> transaction.commit()
139
    >>> transaction.commit()
4134
140
140
4135
141
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
4136
141
    >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
142
    >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
4137
142
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
4138
143
    >>> txn = LaunchpadZopelessLayer.txn
143
    >>> txn = LaunchpadZopelessLayer.txn
4139
144
    >>> bug_watch_updater = CheckwatchesMaster(txn)
144
    >>> bug_watch_updater = CheckwatchesMaster(txn)
4140
145
    >>> roundup = TestRoundup(example_bug_tracker.baseurl)
145
    >>> roundup = TestRoundup(example_bug_tracker.baseurl)
4141
146
146
4142
=== modified file 'lib/lp/bugs/doc/externalbugtracker-rt.txt'
4143
--- lib/lp/bugs/doc/externalbugtracker-rt.txt	2010-10-09 16:36:22 +0000
4144
+++ lib/lp/bugs/doc/externalbugtracker-rt.txt	2010-10-21 19:08:55 +0000
4145
@@ -11,8 +11,8 @@
4146
11
11
4147
12
    >>> from lp.bugs.externalbugtracker import (
12
    >>> from lp.bugs.externalbugtracker import (
4148
13
    ...     RequestTracker)
13
    ...     RequestTracker)
4151
14
    >>> from canonical.launchpad.interfaces import (
14
    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
4152
15
    ...     BugTrackerType, IExternalBugTracker)
15
    >>> from lp.bugs.interfaces.externalbugtracker import IExternalBugTracker
4153
16
    >>> from lp.bugs.tests.externalbugtracker import (
16
    >>> from lp.bugs.tests.externalbugtracker import (
4154
17
    ...     new_bugtracker)
17
    ...     new_bugtracker)
4155
18
    >>> from canonical.launchpad.webapp.testing import verifyObject
18
    >>> from canonical.launchpad.webapp.testing import verifyObject
4156
@@ -155,8 +155,9 @@
4157
155
First, we create some bug watches to test with. Example.com hosts an RT
155
First, we create some bug watches to test with. Example.com hosts an RT
4158
156
instance which has several bugs that we wish to watch:
156
instance which has several bugs that we wish to watch:
4159
157
157
4162
158
    >>> from canonical.launchpad.interfaces import (
158
    >>> from lp.bugs.interfaces.bug import IBugSet
4163
159
    ...     IBugSet, IBugWatchSet, IPersonSet)
159
    >>> from lp.bugs.interfaces.bugwatch import IBugWatchSet
4164
160
    >>> from lp.registry.interfaces.person import IPersonSet
4165
160
    >>> from lp.bugs.tests.externalbugtracker import (
161
    >>> from lp.bugs.tests.externalbugtracker import (
4166
161
    ...     print_bugwatches)
162
    ...     print_bugwatches)
4167
162
163
4168
@@ -180,8 +181,8 @@
4169
180
181
4170
181
    >>> transaction.commit()
182
    >>> transaction.commit()
4171
182
183
4172
184
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
4173
183
    >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
185
    >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
4174
184
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
4175
185
    >>> txn = LaunchpadZopelessLayer.txn
186
    >>> txn = LaunchpadZopelessLayer.txn
4176
186
    >>> bug_watch_updater = CheckwatchesMaster(txn)
187
    >>> bug_watch_updater = CheckwatchesMaster(txn)
4177
187
    >>> rt = TestRequestTracker(example_bug_tracker.baseurl)
188
    >>> rt = TestRequestTracker(example_bug_tracker.baseurl)
4178
188
189
4179
=== modified file 'lib/lp/bugs/doc/externalbugtracker-sourceforge.txt'
4180
--- lib/lp/bugs/doc/externalbugtracker-sourceforge.txt	2010-10-09 16:36:22 +0000
4181
+++ lib/lp/bugs/doc/externalbugtracker-sourceforge.txt	2010-10-21 19:08:55 +0000
4182
@@ -12,9 +12,9 @@
4183
12
12
4184
13
    >>> from lp.bugs.externalbugtracker import (
13
    >>> from lp.bugs.externalbugtracker import (
4185
14
    ...     SourceForge)
14
    ...     SourceForge)
4186
15
    >>> from canonical.launchpad.interfaces import (
4187
16
    ...     BugTrackerType, IExternalBugTracker)
4188
17
    >>> from canonical.launchpad.webapp.testing import verifyObject
15
    >>> from canonical.launchpad.webapp.testing import verifyObject
4189
16
    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
4190
17
    >>> from lp.bugs.interfaces.externalbugtracker import IExternalBugTracker
4191
18
    >>> verifyObject(IExternalBugTracker,
18
    >>> verifyObject(IExternalBugTracker,
4192
19
    ...     SourceForge('http://example.com'))
19
    ...     SourceForge('http://example.com'))
4193
20
    True
20
    True
4194
@@ -161,8 +161,8 @@
4195
161
161
4196
162
    >>> transaction.commit()
162
    >>> transaction.commit()
4197
163
163
4198
164
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
4199
164
    >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
165
    >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
4200
165
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
4201
166
    >>> txn = LaunchpadZopelessLayer.txn
166
    >>> txn = LaunchpadZopelessLayer.txn
4202
167
    >>> bug_watch_updater = CheckwatchesMaster(txn)
167
    >>> bug_watch_updater = CheckwatchesMaster(txn)
4203
168
    >>> sourceforge = TestSourceForge(example_bug_tracker.baseurl)
168
    >>> sourceforge = TestSourceForge(example_bug_tracker.baseurl)
4204
169
169
4205
=== modified file 'lib/lp/bugs/doc/externalbugtracker-trac-lp-plugin.txt'
4206
--- lib/lp/bugs/doc/externalbugtracker-trac-lp-plugin.txt	2010-10-09 16:36:22 +0000
4207
+++ lib/lp/bugs/doc/externalbugtracker-trac-lp-plugin.txt	2010-10-21 19:08:55 +0000
4208
@@ -31,8 +31,8 @@
4209
31
31
4210
32
    >>> import random
32
    >>> import random
4211
33
    >>> from canonical.config import config
33
    >>> from canonical.config import config
4212
34
    >>> from canonical.launchpad.interfaces.logintoken import ILoginTokenSet
4213
34
    >>> from canonical.launchpad.webapp.url import urlappend
35
    >>> from canonical.launchpad.webapp.url import urlappend
4214
35
    >>> from canonical.launchpad.interfaces.logintoken import ILoginTokenSet
4215
36
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
36
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
4216
37
37
4217
38
    >>> class FakeResponse:
38
    >>> class FakeResponse:
4218
@@ -338,8 +338,10 @@
4219
338
We also need an example Bug, BugTracker and BugWatch.
338
We also need an example Bug, BugTracker and BugWatch.
4220
339
339
4221
340
    >>> from canonical.database.sqlbase import commit
340
    >>> from canonical.database.sqlbase import commit
4224
341
    >>> from canonical.launchpad.interfaces import (
341
    >>> from lp.bugs.interfaces.bug import CreateBugParams
4225
342
    ...     BugTrackerType, CreateBugParams, IPersonSet, IProductSet)
342
    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
4226
343
    >>> from lp.registry.interfaces.person import IPersonSet
4227
344
    >>> from lp.registry.interfaces.product import IProductSet
4228
343
    >>> from lp.bugs.tests.externalbugtracker import (
345
    >>> from lp.bugs.tests.externalbugtracker import (
4229
344
    ...     new_bugtracker)
346
    ...     new_bugtracker)
4230
345
347
4231
346
348
4232
=== modified file 'lib/lp/bugs/doc/externalbugtracker-trac.txt'
4233
--- lib/lp/bugs/doc/externalbugtracker-trac.txt	2010-10-11 16:17:45 +0000
4234
+++ lib/lp/bugs/doc/externalbugtracker-trac.txt	2010-10-21 19:08:55 +0000
4235
@@ -13,9 +13,9 @@
4236
13
    >>> from lp.bugs.externalbugtracker import Trac
13
    >>> from lp.bugs.externalbugtracker import Trac
4237
14
    >>> from lp.bugs.tests.externalbugtracker import (
14
    >>> from lp.bugs.tests.externalbugtracker import (
4238
15
    ...     new_bugtracker)
15
    ...     new_bugtracker)
4239
16
    >>> from canonical.launchpad.interfaces import (
4240
17
    ...     BugTrackerType, IExternalBugTracker)
4241
18
    >>> from canonical.launchpad.webapp.testing import verifyObject
16
    >>> from canonical.launchpad.webapp.testing import verifyObject
4242
17
    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
4243
18
    >>> from lp.bugs.interfaces.externalbugtracker import IExternalBugTracker
4244
19
    >>> trac = Trac('http://example.com/')
19
    >>> trac = Trac('http://example.com/')
4245
20
    >>> verifyObject(IExternalBugTracker, trac)
20
    >>> verifyObject(IExternalBugTracker, trac)
4246
21
    True
21
    True
4247
@@ -55,9 +55,9 @@
4248
55
a valid token, which is very unlikely), is that the broken Trac will
55
a valid token, which is very unlikely), is that the broken Trac will
4249
56
not include a "trac_auth" cookie.
56
not include a "trac_auth" cookie.
4250
57
57
4251
58
    >>> from StringIO import StringIO
4252
58
    >>> from httplib import HTTPMessage
59
    >>> from httplib import HTTPMessage
4253
59
    >>> from urllib import addinfourl
60
    >>> from urllib import addinfourl
4254
60
    >>> from StringIO import StringIO
4255
61
61
4256
62
    >>> class TracReturning200ForPageNotFound(Trac):
62
    >>> class TracReturning200ForPageNotFound(Trac):
4257
63
    ...     def urlopen(self, url):
63
    ...     def urlopen(self, url):
4258
@@ -298,8 +298,8 @@
4259
298
298
4260
299
    >>> transaction.commit()
299
    >>> transaction.commit()
4261
300
300
4262
301
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
4263
301
    >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
302
    >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
4264
302
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
4265
303
    >>> txn = LaunchpadZopelessLayer.txn
303
    >>> txn = LaunchpadZopelessLayer.txn
4266
304
    >>> bug_watch_updater = CheckwatchesMaster(txn)
304
    >>> bug_watch_updater = CheckwatchesMaster(txn)
4267
305
    >>> trac = TestTrac(example_bug_tracker.baseurl)
305
    >>> trac = TestTrac(example_bug_tracker.baseurl)
4268
306
306
4269
=== modified file 'lib/lp/bugs/doc/externalbugtracker.txt'
4270
--- lib/lp/bugs/doc/externalbugtracker.txt	2010-10-09 16:36:22 +0000
4271
+++ lib/lp/bugs/doc/externalbugtracker.txt	2010-10-21 19:08:55 +0000
4272
@@ -433,9 +433,9 @@
4273
433
getModifiedRemoteBugs(). I.e., if we have a set of newly created bug
433
getModifiedRemoteBugs(). I.e., if we have a set of newly created bug
4274
434
watches, the getModifiedRemoteBugs() method won't be called.
434
watches, the getModifiedRemoteBugs() method won't be called.
4275
435
435
4276
436
    >>> from lp.bugs.model.bugtracker import BugTracker
4277
437
    >>> from lp.bugs.interfaces.bug import IBugSet
436
    >>> from lp.bugs.interfaces.bug import IBugSet
4278
438
    >>> from lp.bugs.interfaces.bugwatch import IBugWatchSet
437
    >>> from lp.bugs.interfaces.bugwatch import IBugWatchSet
4279
438
    >>> from lp.bugs.model.bugtracker import BugTracker
4280
439
    >>> from lp.registry.interfaces.person import IPersonSet
439
    >>> from lp.registry.interfaces.person import IPersonSet
4281
440
440
4282
441
    >>> sample_person = getUtility(IPersonSet).getByEmail(
441
    >>> sample_person = getUtility(IPersonSet).getByEmail(
4283
442
442
4284
=== modified file 'lib/lp/bugs/doc/hasbugs.txt'
4285
--- lib/lp/bugs/doc/hasbugs.txt	2010-10-10 15:39:28 +0000
4286
+++ lib/lp/bugs/doc/hasbugs.txt	2010-10-21 19:08:55 +0000
4287
@@ -5,8 +5,8 @@
4288
5
between the object and some of the bug tasks connected to it, and allows
5
between the object and some of the bug tasks connected to it, and allows
4289
6
searching through the list of bugs.
6
searching through the list of bugs.
4290
7
7
4291
8
    >>> from zope.component import getUtility
4292
8
    >>> from canonical.launchpad.webapp.testing import verifyObject
9
    >>> from canonical.launchpad.webapp.testing import verifyObject
4293
9
    >>> from zope.component import getUtility
4294
10
    >>> from lp.bugs.interfaces.bugtarget import IHasBugs
10
    >>> from lp.bugs.interfaces.bugtarget import IHasBugs
4295
11
    >>> from lp.registry.interfaces.distribution import IDistributionSet
11
    >>> from lp.registry.interfaces.distribution import IDistributionSet
4296
12
    >>> distroset = getUtility(IDistributionSet)
12
    >>> distroset = getUtility(IDistributionSet)
4297
@@ -30,8 +30,11 @@
4298
30
30
4299
31
    >>> login("foo.bar@canonical.com")
31
    >>> login("foo.bar@canonical.com")
4300
32
32
4303
33
    >>> from canonical.launchpad.interfaces import (
33
    >>> from lp.bugs.interfaces.bugtask import (
4304
34
    ...     BugTaskImportance, BugTaskStatus, IBugTaskSet)
34
    ...     BugTaskImportance,
4305
35
    ...     BugTaskStatus,
4306
36
    ...     IBugTaskSet,
4307
37
    ...     )
4308
35
38
4309
36
    >>> bug_one_in_debian_firefox = getUtility(IBugTaskSet).get(4)
39
    >>> bug_one_in_debian_firefox = getUtility(IBugTaskSet).get(4)
4310
37
    >>> bug_two_in_debian_firefox = getUtility(IBugTaskSet).get(5)
40
    >>> bug_two_in_debian_firefox = getUtility(IBugTaskSet).get(5)
4311
38
41
4312
=== modified file 'lib/lp/bugs/doc/initial-bug-contacts.txt'
4313
--- lib/lp/bugs/doc/initial-bug-contacts.txt	2010-10-14 18:42:19 +0000
4314
+++ lib/lp/bugs/doc/initial-bug-contacts.txt	2010-10-21 19:08:55 +0000
4315
@@ -388,9 +388,9 @@
4316
388
The list of teams that a user may add to a package as a bug supervisor will
388
The list of teams that a user may add to a package as a bug supervisor will
4317
389
only contain those teams of which the user is an administrator.
389
only contain those teams of which the user is an administrator.
4318
390
390
4319
391
    >>> from lp.registry.interfaces.distribution import IDistributionSet
4320
392
    >>> from zope.component import getMultiAdapter
391
    >>> from zope.component import getMultiAdapter
4321
393
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
392
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
4322
393
    >>> from lp.registry.interfaces.distribution import IDistributionSet
4323
394
394
4324
395
    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
395
    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
4325
396
    >>> package = ubuntu.getSourcePackage('mozilla-firefox')
396
    >>> package = ubuntu.getSourcePackage('mozilla-firefox')
4326
397
397
4327
=== modified file 'lib/lp/bugs/doc/malone-karma.txt'
4328
--- lib/lp/bugs/doc/malone-karma.txt	2010-10-10 15:39:28 +0000
4329
+++ lib/lp/bugs/doc/malone-karma.txt	2010-10-21 19:08:55 +0000
4330
@@ -2,8 +2,10 @@
4331
2
import some stuff and define a function to help us make the
2
import some stuff and define a function to help us make the
4332
3
documentation cleaner:
3
documentation cleaner:
4333
4
4
4336
5
    >>> from canonical.launchpad.interfaces import (
5
    >>> from lp.bugs.interfaces.bug import IBugSet
4337
6
    ...     IBugSet, IDistributionSet, IKarmaActionSet, IPersonSet)
6
    >>> from lp.registry.interfaces.distribution import IDistributionSet
4338
7
    >>> from lp.registry.interfaces.karma import IKarmaActionSet
4339
8
    >>> from lp.registry.interfaces.person import IPersonSet
4340
7
    >>> foo_bar = getUtility(IPersonSet).getByEmail('foo.bar@canonical.com')
9
    >>> foo_bar = getUtility(IPersonSet).getByEmail('foo.bar@canonical.com')
4341
8
10
4342
9
Setup an event listener to help ensure karma is assigned when it should.
11
Setup an event listener to help ensure karma is assigned when it should.
4343
@@ -70,8 +72,10 @@
4344
70
72
4345
71
Mark a bug task as fixed:
73
Mark a bug task as fixed:
4346
72
74
4349
73
    >>> from canonical.launchpad.interfaces import (
75
    >>> from lp.bugs.interfaces.bugtask import (
4350
74
    ...     BugTaskStatus, IDistroBugTask)
76
    ...     BugTaskStatus,
4351
77
    ...     IDistroBugTask,
4352
78
    ...     )
4353
75
    >>> bugtask = bug.bugtasks[0]
79
    >>> bugtask = bug.bugtasks[0]
4354
76
    >>> old_bugtask = Snapshot(bugtask, providing=IDistroBugTask)
80
    >>> old_bugtask = Snapshot(bugtask, providing=IDistroBugTask)
4355
77
    >>> bugtask.transitionToStatus(
81
    >>> bugtask.transitionToStatus(
4356
78
82
4357
=== modified file 'lib/lp/bugs/doc/malone-xmlrpc.txt'
4358
--- lib/lp/bugs/doc/malone-xmlrpc.txt	2010-10-09 16:36:22 +0000
4359
+++ lib/lp/bugs/doc/malone-xmlrpc.txt	2010-10-21 19:08:55 +0000
4360
@@ -46,8 +46,8 @@
4361
46
IObjectCreatedEvent is being published when a bug is reported through
46
IObjectCreatedEvent is being published when a bug is reported through
4362
47
the XML-RPC interface.
47
the XML-RPC interface.
4363
48
48
4364
49
    >>> from canonical.launchpad.ftests.event import TestEventListener
4365
49
    >>> from lazr.lifecycle.interfaces import IObjectCreatedEvent
50
    >>> from lazr.lifecycle.interfaces import IObjectCreatedEvent
4366
50
    >>> from canonical.launchpad.ftests.event import TestEventListener
4367
51
    >>> from lp.bugs.interfaces.bug import IBug
51
    >>> from lp.bugs.interfaces.bug import IBug
4368
52
52
4369
53
    >>> def on_created_event(obj, event):
53
    >>> def on_created_event(obj, event):
4370
@@ -233,8 +233,10 @@
4371
233
for authentication with external bug trackers.
233
for authentication with external bug trackers.
4372
234
234
4373
235
    >>> from zope.component import getUtility
235
    >>> from zope.component import getUtility
4376
236
    >>> from canonical.launchpad.interfaces import (
236
    >>> from canonical.launchpad.interfaces.launchpad import (
4377
237
    ...     IPrivateMaloneApplication, IPrivateApplication)
237
    ...     IPrivateApplication,
4378
238
    ...     IPrivateMaloneApplication,
4379
239
    ...     )
4380
238
    >>> from canonical.launchpad.webapp.testing import verifyObject
240
    >>> from canonical.launchpad.webapp.testing import verifyObject
4381
239
241
4382
240
    >>> private_root = getUtility(IPrivateApplication)
242
    >>> private_root = getUtility(IPrivateApplication)
4383
@@ -245,9 +247,9 @@
4384
245
The API provides a single method, newBugTrackerToken(), which returns
247
The API provides a single method, newBugTrackerToken(), which returns
4385
246
the ID of the new LoginToken.
248
the ID of the new LoginToken.
4386
247
249
4387
250
    >>> from canonical.launchpad.interfaces.logintoken import ILoginTokenSet
4388
248
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
251
    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
4391
249
    >>> from canonical.launchpad.interfaces import (
252
    >>> from lp.bugs.interfaces.externalbugtracker import IExternalBugTrackerTokenAPI
4390
250
    ...     IExternalBugTrackerTokenAPI, ILoginTokenSet)
4392
251
    >>> from lp.bugs.xmlrpc.bug import (
253
    >>> from lp.bugs.xmlrpc.bug import (
4393
252
    ...     ExternalBugTrackerTokenAPI)
254
    ...     ExternalBugTrackerTokenAPI)
4394
253
255
4395
254
256
4396
=== modified file 'lib/lp/bugs/doc/official-bug-tags.txt'
4397
--- lib/lp/bugs/doc/official-bug-tags.txt	2010-10-09 16:36:22 +0000
4398
+++ lib/lp/bugs/doc/official-bug-tags.txt	2010-10-21 19:08:55 +0000
4399
@@ -3,8 +3,8 @@
4400
3
Distributions and products can define official bug tags.
3
Distributions and products can define official bug tags.
4401
4
4
4402
5
    >>> from zope.component import getUtility
5
    >>> from zope.component import getUtility
4405
6
    >>> from canonical.launchpad.interfaces import (
6
    >>> from lp.registry.interfaces.distribution import IDistributionSet
4406
7
    ...     IDistributionSet, IProductSet)
7
    >>> from lp.registry.interfaces.product import IProductSet
4407
8
    >>> from canonical.launchpad.webapp.interfaces import (
8
    >>> from canonical.launchpad.webapp.interfaces import (
4408
9
    ...     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
9
    ...     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
4409
10
    >>> from lp.bugs.model.bugtarget import OfficialBugTag
10
    >>> from lp.bugs.model.bugtarget import OfficialBugTag
4410
@@ -169,7 +169,7 @@
4411
169
    >>> ubuntu.official_bug_tags = [u'foo', u'bar']
169
    >>> ubuntu.official_bug_tags = [u'foo', u'bar']
4412
170
    Traceback (most recent call last):
170
    Traceback (most recent call last):
4413
171
    ...
171
    ...
4415
172
    Unauthorized: (<Distribution 'Ubuntu' (ubuntu)>, 'official_bug_tags', 'launchpad.Edit')
172
    Unauthorized: (<Distribution 'Ubuntu' (ubuntu)>, 'official_bug_tags', 'launchpad.BugSupervisor')
4416
173
173
4417
174
The same is available for products.
174
The same is available for products.
4418
175
175
4419
176
176
4420
=== modified file 'lib/lp/bugs/doc/security-teams.txt'
4421
--- lib/lp/bugs/doc/security-teams.txt	2010-10-11 16:17:45 +0000
4422
+++ lib/lp/bugs/doc/security-teams.txt	2010-10-21 19:08:55 +0000
4423
@@ -5,10 +5,10 @@
4424
5
a "security contact" on a Distribution or a Product.
5
a "security contact" on a Distribution or a Product.
4425
6
6
4426
7
    >>> from zope.component import getUtility
7
    >>> from zope.component import getUtility
4427
8
    >>> from lp.bugs.interfaces.securitycontact import IHasSecurityContact
4428
8
    >>> from lp.registry.interfaces.distribution import IDistributionSet
9
    >>> from lp.registry.interfaces.distribution import IDistributionSet
4429
9
    >>> from lp.registry.interfaces.person import IPersonSet
10
    >>> from lp.registry.interfaces.person import IPersonSet
4430
10
    >>> from lp.registry.interfaces.product import IProductSet
11
    >>> from lp.registry.interfaces.product import IProductSet
4431
11
    >>> from lp.bugs.interfaces.securitycontact import IHasSecurityContact
4432
12
12
4433
13
    >>> personset = getUtility(IPersonSet)
13
    >>> personset = getUtility(IPersonSet)
4434
14
    >>> productset = getUtility(IProductSet)
14
    >>> productset = getUtility(IProductSet)
4435
@@ -280,10 +280,10 @@
4436
280
When a bug becomes security-related, the security contacts for the pillars it
280
When a bug becomes security-related, the security contacts for the pillars it
4437
281
affects are subscribed to it.
281
affects are subscribed to it.
4438
282
282
4439
283
    >>> from zope.event import notify
4440
284
    >>> from lazr.lifecycle.event import ObjectModifiedEvent
4441
285
    >>> from lazr.lifecycle.snapshot import Snapshot
4442
283
    >>> from lp.bugs.interfaces.bug import IBug
286
    >>> from lp.bugs.interfaces.bug import IBug
4443
284
    >>> from zope.event import notify
4444
285
    >>> from lazr.lifecycle.event import ObjectModifiedEvent
4445
286
    >>> from lazr.lifecycle.snapshot import Snapshot
4446
287
287
4447
288
    >>> product = factory.makeProduct()
288
    >>> product = factory.makeProduct()
4448
289
    >>> product.security_contact = factory.makePerson(
289
    >>> product.security_contact = factory.makePerson(
4449
290
290
4450
=== modified file 'lib/lp/bugs/doc/sourceforge-remote-products.txt'
4451
--- lib/lp/bugs/doc/sourceforge-remote-products.txt	2010-10-04 19:50:45 +0000
4452
+++ lib/lp/bugs/doc/sourceforge-remote-products.txt	2010-10-21 19:08:55 +0000
4453
@@ -21,8 +21,8 @@
4454
21
If we add a Product and link it to a SourceForge project,
21
If we add a Product and link it to a SourceForge project,
4455
22
getSFLinkedProductsWithNoneRemoteProduct() will return it.
22
getSFLinkedProductsWithNoneRemoteProduct() will return it.
4456
23
23
4457
24
    >>> from lp.testing.factory import LaunchpadObjectFactory
4458
24
    >>> from transaction import commit
25
    >>> from transaction import commit
4459
25
    >>> from lp.testing.factory import LaunchpadObjectFactory
4460
26
    >>> factory = LaunchpadObjectFactory()
26
    >>> factory = LaunchpadObjectFactory()
4461
27
27
4462
28
    >>> product_1 = factory.makeProduct(name='my-first-product')
28
    >>> product_1 = factory.makeProduct(name='my-first-product')
4463
29
29
4464
=== modified file 'lib/lp/bugs/stories/bug-privacy/40-unsubscribe-from-private-bug.txt'
4465
--- lib/lp/bugs/stories/bug-privacy/40-unsubscribe-from-private-bug.txt	2010-10-04 20:46:55 +0000
4466
+++ lib/lp/bugs/stories/bug-privacy/40-unsubscribe-from-private-bug.txt	2010-10-21 19:08:55 +0000
4467
@@ -1,10 +1,11 @@
4468
1
First, some setup. Find out what the latest [private] bug reported on
1
First, some setup. Find out what the latest [private] bug reported on
4469
2
Ubuntu evolution is, so we can avoid hardcoding its ID here:
2
Ubuntu evolution is, so we can avoid hardcoding its ID here:
4470
3
3
4471
4
    >>> from canonical.launchpad.interfaces import (
4472
5
    ...     IDistributionSet, BugTaskSearchParams, ILaunchBag,
4473
6
    ...     ISourcePackageNameSet)
4474
7
    >>> from zope.component import getUtility
4
    >>> from zope.component import getUtility
4475
5
    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
4476
6
    >>> from lp.bugs.interfaces.bugtask import BugTaskSearchParams
4477
7
    >>> from lp.registry.interfaces.distribution import IDistributionSet
4478
8
    >>> from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
4479
8
    >>> from canonical.launchpad.ftests import login, logout
9
    >>> from canonical.launchpad.ftests import login, logout
4480
9
10
4481
10
    >>> login("foo.bar@canonical.com")
11
    >>> login("foo.bar@canonical.com")
4482
11
12
4483
=== modified file 'lib/lp/bugs/stories/bug-tags/xx-official-bug-tags.txt'
4484
--- lib/lp/bugs/stories/bug-tags/xx-official-bug-tags.txt	2010-10-15 14:26:57 +0000
4485
+++ lib/lp/bugs/stories/bug-tags/xx-official-bug-tags.txt	2010-10-21 19:08:55 +0000
4486
@@ -71,6 +71,17 @@
4487
71
    >>> print bug_super_browser.url
71
    >>> print bug_super_browser.url
4488
72
    http://bugs.launchpad.dev/youbuntu/+manage-official-tags
72
    http://bugs.launchpad.dev/youbuntu/+manage-official-tags
4489
73
73
4490
74
The bug supervisor can also set the tags for the product.
4491
75
4492
76
    >>> bug_super_browser.getControl('Official Bug Tags').value = 'foo bar'
4493
77
    >>> bug_super_browser.getControl('Save').click()
4494
78
    >>> print bug_super_browser.url
4495
79
    http://bugs.launchpad.dev/youbuntu
4496
80
    >>> bug_super_browser.open(
4497
81
    ...     'http://bugs.launchpad.dev/youbuntu/+manage-official-tags')
4498
82
    >>> print bug_super_browser.getControl('Official Bug Tags').value
4499
83
    bar foo
4500
84
4501
74
== Official Tags on Bug Pages ==
85
== Official Tags on Bug Pages ==
4502
75
86
4503
76
Official tags are displayed using a different style from unofficial ones.
87
Official tags are displayed using a different style from unofficial ones.
4504
@@ -101,8 +112,8 @@
4505
101
112
4506
102
The tags portlet displays a mix of official and unofficial tags.
113
The tags portlet displays a mix of official and unofficial tags.
4507
103
114
4508
115
    >>> from zope.component import getUtility
4509
104
    >>> from lp.registry.interfaces.product import IProductSet
116
    >>> from lp.registry.interfaces.product import IProductSet
4510
105
    >>> from zope.component import getUtility
4511
106
    >>> login('foo.bar@canonical.com')
117
    >>> login('foo.bar@canonical.com')
4512
107
    >>> firesocks = factory.makeProduct(name='firesocks')
118
    >>> firesocks = factory.makeProduct(name='firesocks')
4513
108
    >>> firesocks_bugs_url = canonical_url(firesocks, rootsite='bugs')
119
    >>> firesocks_bugs_url = canonical_url(firesocks, rootsite='bugs')
4514
109
120
4515
=== modified file 'lib/lp/bugs/stories/bugattachments/xx-attachments-to-bug-report.txt'
4516
--- lib/lp/bugs/stories/bugattachments/xx-attachments-to-bug-report.txt	2010-10-09 16:36:22 +0000
4517
+++ lib/lp/bugs/stories/bugattachments/xx-attachments-to-bug-report.txt	2010-10-21 19:08:55 +0000
4518
@@ -22,8 +22,8 @@
4519
22
    >>> import StringIO
22
    >>> import StringIO
4520
23
    >>> from zope.component import getUtility
23
    >>> from zope.component import getUtility
4521
24
    >>> from canonical.launchpad.ftests import login, logout, syncUpdate
24
    >>> from canonical.launchpad.ftests import login, logout, syncUpdate
4522
25
    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
4523
25
    >>> from lp.bugs.interfaces.bug import IBugSet
26
    >>> from lp.bugs.interfaces.bug import IBugSet
4524
26
    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
4525
27
    >>> login("test@canonical.com")
27
    >>> login("test@canonical.com")
4526
28
    >>> bug_11 = getUtility(IBugSet).get(11)
28
    >>> bug_11 = getUtility(IBugSet).get(11)
4527
29
    >>> launchbag = getUtility(ILaunchBag)
29
    >>> launchbag = getUtility(ILaunchBag)
4528
30
30
4529
=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-nomination-table-row.txt'
4530
--- lib/lp/bugs/stories/bugs/xx-bug-nomination-table-row.txt	2010-10-10 15:39:28 +0000
4531
+++ lib/lp/bugs/stories/bugs/xx-bug-nomination-table-row.txt	2010-10-21 19:08:55 +0000
4532
@@ -12,9 +12,9 @@
4533
12
    >>> from zope.component import getUtility
12
    >>> from zope.component import getUtility
4534
13
13
4535
14
    >>> from canonical.launchpad.ftests import login, logout
14
    >>> from canonical.launchpad.ftests import login, logout
4536
15
    >>> from canonical.launchpad.webapp.authorization import check_permission
4537
15
    >>> from lp.bugs.interfaces.bug import IBugSet
16
    >>> from lp.bugs.interfaces.bug import IBugSet
4538
16
    >>> from lp.registry.interfaces.distribution import IDistributionSet
17
    >>> from lp.registry.interfaces.distribution import IDistributionSet
4539
17
    >>> from canonical.launchpad.webapp.authorization import check_permission
4540
18
18
4541
19
    >>> login("no-priv@canonical.com")
19
    >>> login("no-priv@canonical.com")
4542
20
20
4543
21
21
4544
=== modified file 'lib/lp/bugs/stories/bugs/xx-bugs-advanced-search-upstream-status.txt'
4545
--- lib/lp/bugs/stories/bugs/xx-bugs-advanced-search-upstream-status.txt	2010-10-03 15:30:06 +0000
4546
+++ lib/lp/bugs/stories/bugs/xx-bugs-advanced-search-upstream-status.txt	2010-10-21 19:08:55 +0000
4547
@@ -39,8 +39,9 @@
4548
39
39
4549
40
    >>> from zope.component import getUtility
40
    >>> from zope.component import getUtility
4550
41
    >>> from canonical.launchpad.ftests import login, logout, syncUpdate
41
    >>> from canonical.launchpad.ftests import login, logout, syncUpdate
4553
42
    >>> from canonical.launchpad.interfaces import (
42
    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
4554
43
    ...     BugTaskStatus, IBugSet, ILaunchBag)
43
    >>> from lp.bugs.interfaces.bug import IBugSet
4555
44
    >>> from lp.bugs.interfaces.bugtask import BugTaskStatus
4556
44
45
4557
45
    >>> login("foo.bar@canonical.com")
46
    >>> login("foo.bar@canonical.com")
4558
46
47
4559
47
48
4560
=== modified file 'lib/lp/bugs/stories/bugs/xx-front-page-bug-lists.txt'
4561
--- lib/lp/bugs/stories/bugs/xx-front-page-bug-lists.txt	2010-10-03 15:30:06 +0000
4562
+++ lib/lp/bugs/stories/bugs/xx-front-page-bug-lists.txt	2010-10-21 19:08:55 +0000
4563
@@ -9,8 +9,11 @@
4564
9
    >>> from zope.component import getUtility
9
    >>> from zope.component import getUtility
4565
10
    >>> from canonical.launchpad.ftests import login, logout
10
    >>> from canonical.launchpad.ftests import login, logout
4566
11
    >>> import transaction
11
    >>> import transaction
4569
12
    >>> from canonical.launchpad.interfaces import (
12
    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
4570
13
    ...     BugTaskImportance, BugTaskStatus, ILaunchBag)
13
    >>> from lp.bugs.interfaces.bugtask import (
4571
14
    ...     BugTaskImportance,
4572
15
    ...     BugTaskStatus,
4573
16
    ...     )
4574
14
    >>> login('foo.bar@canonical.com')
17
    >>> login('foo.bar@canonical.com')
4575
15
    >>> bigfixer = factory.makeProduct(name='bigfixer')
18
    >>> bigfixer = factory.makeProduct(name='bigfixer')
4576
16
    >>> for bug_x in range(1, 11):
19
    >>> for bug_x in range(1, 11):
4577
17
20
4578
=== modified file 'lib/lp/bugs/stories/bugs/xx-incomplete-bugs.txt'
4579
--- lib/lp/bugs/stories/bugs/xx-incomplete-bugs.txt	2010-10-09 16:36:22 +0000
4580
+++ lib/lp/bugs/stories/bugs/xx-incomplete-bugs.txt	2010-10-21 19:08:55 +0000
4581
@@ -104,9 +104,9 @@
4582
104
detailing the amount of time that has passed since the bug's expiration
104
detailing the amount of time that has passed since the bug's expiration
4583
105
date. We alter the date_last_updated field of bug 11 to demonstrate this.
105
date. We alter the date_last_updated field of bug 11 to demonstrate this.
4584
106
106
4585
107
    >>> from datetime import timedelta
4586
108
    >>> from zope.component import getUtility
107
    >>> from zope.component import getUtility
4587
109
    >>> from canonical.database.sqlbase import flush_database_updates
108
    >>> from canonical.database.sqlbase import flush_database_updates
4588
109
    >>> from datetime import timedelta
4589
110
    >>> from canonical.launchpad.ftests import login, logout
110
    >>> from canonical.launchpad.ftests import login, logout
4590
111
    >>> from lp.bugs.interfaces.bug import IBugSet
111
    >>> from lp.bugs.interfaces.bug import IBugSet
4591
112
    >>> login('test@canonical.com')
112
    >>> login('test@canonical.com')
4592
113
113
4593
=== modified file 'lib/lp/bugs/stories/bugs/xx-portlets-bug-milestones.txt'
4594
--- lib/lp/bugs/stories/bugs/xx-portlets-bug-milestones.txt	2010-10-08 12:06:55 +0000
4595
+++ lib/lp/bugs/stories/bugs/xx-portlets-bug-milestones.txt	2010-10-21 19:08:55 +0000
4596
@@ -55,8 +55,8 @@
4597
55
    >>> print ff_bugtask.bug.id
55
    >>> print ff_bugtask.bug.id
4598
56
    4
56
    4
4599
57
57
4600
58
    >>> from lp.registry.interfaces.milestone import IMilestoneSet
4601
58
    >>> from lp.registry.interfaces.product import IProductSet
59
    >>> from lp.registry.interfaces.product import IProductSet
4602
59
    >>> from lp.registry.interfaces.milestone import IMilestoneSet
4603
60
    >>> firefox = getUtility(IProductSet).getByName('firefox')
60
    >>> firefox = getUtility(IProductSet).getByName('firefox')
4604
61
    >>> ff_milestone = getUtility(IMilestoneSet).getByNameAndProduct(
61
    >>> ff_milestone = getUtility(IMilestoneSet).getByNameAndProduct(
4605
62
    ...     "1.0", firefox)
62
    ...     "1.0", firefox)
4606
63
63
4607
=== modified file 'lib/lp/bugs/stories/bugs/xx-remote-bug-comments.txt'
4608
--- lib/lp/bugs/stories/bugs/xx-remote-bug-comments.txt	2010-10-14 18:42:19 +0000
4609
+++ lib/lp/bugs/stories/bugs/xx-remote-bug-comments.txt	2010-10-21 19:08:55 +0000
4610
@@ -72,9 +72,9 @@
4611
72
the 'awaiting synchronization' mark goes away.
72
the 'awaiting synchronization' mark goes away.
4612
73
73
4613
74
    >>> from zope.component import getUtility
74
    >>> from zope.component import getUtility
4614
75
    >>> from canonical.database.sqlbase import flush_database_updates
4615
75
    >>> from lp.bugs.interfaces.bug import IBugSet
76
    >>> from lp.bugs.interfaces.bug import IBugSet
4616
76
    >>> from lp.bugs.interfaces.bugmessage import IBugMessageSet
77
    >>> from lp.bugs.interfaces.bugmessage import IBugMessageSet
4617
77
    >>> from canonical.database.sqlbase import flush_database_updates
4618
78
    >>> login('foo.bar@canonical.com')
78
    >>> login('foo.bar@canonical.com')
4619
79
    >>> bug_15 = getUtility(IBugSet).get(15)
79
    >>> bug_15 = getUtility(IBugSet).get(15)
4620
80
    >>> message = bug_15.messages[-1]
80
    >>> message = bug_15.messages[-1]
4621
81
81
4622
=== modified file 'lib/lp/bugs/stories/bugtask-management/xx-bug-importance-change.txt'
4623
--- lib/lp/bugs/stories/bugtask-management/xx-bug-importance-change.txt	2010-10-03 15:30:06 +0000
4624
+++ lib/lp/bugs/stories/bugtask-management/xx-bug-importance-change.txt	2010-10-21 19:08:55 +0000
4625
@@ -23,8 +23,9 @@
4626
23
    >>> from zope.component import getUtility
23
    >>> from zope.component import getUtility
4627
24
24
4628
25
    >>> from canonical.launchpad.ftests import ANONYMOUS, login, logout
25
    >>> from canonical.launchpad.ftests import ANONYMOUS, login, logout
4631
26
    >>> from canonical.launchpad.interfaces import (
26
    >>> from lp.registry.interfaces.distribution import IDistributionSet
4632
27
    ...     IPersonSet, IProductSet, IDistributionSet)
27
    >>> from lp.registry.interfaces.person import IPersonSet
4633
28
    >>> from lp.registry.interfaces.product import IProductSet
4634
28
29
4635
29
    >>> login("foo.bar@canonical.com")
30
    >>> login("foo.bar@canonical.com")
4636
30
31
4637
31
32
4638
=== modified file 'lib/lp/bugs/stories/bugtask-searches/xx-listing-basics.txt'
4639
--- lib/lp/bugs/stories/bugtask-searches/xx-listing-basics.txt	2010-10-06 18:27:57 +0000
4640
+++ lib/lp/bugs/stories/bugtask-searches/xx-listing-basics.txt	2010-10-21 19:08:55 +0000
4641
@@ -233,10 +233,11 @@
4642
233
Patches also appear as badges in bug listings.
233
Patches also appear as badges in bug listings.
4643
234
234
4644
235
    >>> from canonical.launchpad.ftests import login, logout
235
    >>> from canonical.launchpad.ftests import login, logout
4645
236
    >>> from canonical.launchpad.interfaces import (
4646
237
    ...     IBugSet, IMessageSet, IPersonSet)
4647
238
    >>> from zope.component import getUtility
236
    >>> from zope.component import getUtility
4648
239
    >>> from StringIO import StringIO
237
    >>> from StringIO import StringIO
4649
238
    >>> from canonical.launchpad.interfaces.message import IMessageSet
4650
239
    >>> from lp.bugs.interfaces.bug import IBugSet
4651
240
    >>> from lp.registry.interfaces.person import IPersonSet
4652
240
    >>> import transaction
241
    >>> import transaction
4653
241
    >>> login("foo.bar@canonical.com")
242
    >>> login("foo.bar@canonical.com")
4654
242
    >>> foobar = getUtility(IPersonSet).getByName("name16")
243
    >>> foobar = getUtility(IPersonSet).getByName("name16")
4655
243
244
4656
=== modified file 'lib/lp/bugs/stories/bugtask-searches/xx-searching-by-tags.txt'
4657
--- lib/lp/bugs/stories/bugtask-searches/xx-searching-by-tags.txt	2010-10-03 15:30:06 +0000
4658
+++ lib/lp/bugs/stories/bugtask-searches/xx-searching-by-tags.txt	2010-10-21 19:08:55 +0000
4659
@@ -7,9 +7,10 @@
4660
7
7
4661
8
First, we create some bugs.
8
First, we create some bugs.
4662
9
9
4663
10
    >>> from canonical.launchpad.interfaces import (
4664
11
    ...     IPersonSet, IProductSet, CreateBugParams)
4665
12
    >>> from zope.component import getUtility
10
    >>> from zope.component import getUtility
4666
11
    >>> from lp.bugs.interfaces.bug import CreateBugParams
4667
12
    >>> from lp.registry.interfaces.person import IPersonSet
4668
13
    >>> from lp.registry.interfaces.product import IProductSet
4669
13
    >>> from canonical.launchpad.ftests import login, logout
14
    >>> from canonical.launchpad.ftests import login, logout
4670
14
15
4671
15
    >>> login("no-priv@canonical.com")
16
    >>> login("no-priv@canonical.com")
4672
16
17
4673
=== modified file 'lib/lp/bugs/stories/bugwatches/xx-edit-bugwatch.txt'
4674
--- lib/lp/bugs/stories/bugwatches/xx-edit-bugwatch.txt	2010-08-26 14:57:11 +0000
4675
+++ lib/lp/bugs/stories/bugwatches/xx-edit-bugwatch.txt	2010-10-21 19:08:55 +0000
4676
@@ -60,9 +60,9 @@
4677
60
If we change the next_check date of the watch its will be shown in the
60
If we change the next_check date of the watch its will be shown in the
4678
61
Next check column.
61
Next check column.
4679
62
62
4680
63
    >>> from zope.component import getUtility
4681
63
    >>> from datetime import datetime
64
    >>> from datetime import datetime
4682
64
    >>> from pytz import utc
65
    >>> from pytz import utc
4683
65
    >>> from zope.component import getUtility
4684
66
66
4685
67
    >>> from canonical.launchpad.ftests import login, logout
67
    >>> from canonical.launchpad.ftests import login, logout
4686
68
    >>> from lp.bugs.interfaces.bugwatch import IBugWatchSet
68
    >>> from lp.bugs.interfaces.bugwatch import IBugWatchSet
4687
69
69
4688
=== modified file 'lib/lp/bugs/stories/cve/cve-linking.txt'
4689
--- lib/lp/bugs/stories/cve/cve-linking.txt	2010-10-11 16:17:45 +0000
4690
+++ lib/lp/bugs/stories/cve/cve-linking.txt	2010-10-21 19:08:55 +0000
4691
@@ -109,9 +109,9 @@
4692
109
    # This should use a private bug in our sample data.
109
    # This should use a private bug in our sample data.
4693
110
    >>> from zope.component import getUtility
110
    >>> from zope.component import getUtility
4694
111
    >>> from canonical.launchpad.ftests import login, logout
111
    >>> from canonical.launchpad.ftests import login, logout
4695
112
    >>> from canonical.database.sqlbase import flush_database_updates
4696
112
    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
113
    >>> from canonical.launchpad.webapp.interfaces import ILaunchBag
4697
113
    >>> from lp.bugs.interfaces.bug import IBugSet
114
    >>> from lp.bugs.interfaces.bug import IBugSet
4698
114
    >>> from canonical.database.sqlbase import flush_database_updates
4699
115
    >>> login('foo.bar@canonical.com')
115
    >>> login('foo.bar@canonical.com')
4700
116
    >>> private_bug = getUtility(IBugSet).get(6)
116
    >>> private_bug = getUtility(IBugSet).get(6)
4701
117
    >>> current_user = getUtility(ILaunchBag).user
117
    >>> current_user = getUtility(ILaunchBag).user
4702
118
118
4703
=== modified file 'lib/lp/bugs/stories/feeds/xx-bug-atom.txt'
4704
--- lib/lp/bugs/stories/feeds/xx-bug-atom.txt	2010-10-09 16:36:22 +0000
4705
+++ lib/lp/bugs/stories/feeds/xx-bug-atom.txt	2010-10-21 19:08:55 +0000
4706
@@ -338,8 +338,8 @@
4707
338
This feed gets the latest bugs for a whole team.
338
This feed gets the latest bugs for a whole team.
4708
339
First, make a team responsible for some bugs.
339
First, make a team responsible for some bugs.
4709
340
340
4710
341
    >>> from zope.component import getUtility
4711
341
    >>> from lp.registry.interfaces.person import IPersonSet
342
    >>> from lp.registry.interfaces.person import IPersonSet
4712
342
    >>> from zope.component import getUtility
4713
343
    >>> one_mem_browser = setupBrowser(
343
    >>> one_mem_browser = setupBrowser(
4714
344
    ...    auth='Basic one-membership@test.com:test')
344
    ...    auth='Basic one-membership@test.com:test')
4715
345
    >>> personset = getUtility(IPersonSet)
345
    >>> personset = getUtility(IPersonSet)
4716
346
346
4717
=== modified file 'lib/lp/bugs/stories/feeds/xx-bug-html.txt'
4718
--- lib/lp/bugs/stories/feeds/xx-bug-html.txt	2009-10-13 19:51:20 +0000
4719
+++ lib/lp/bugs/stories/feeds/xx-bug-html.txt	2010-10-21 19:08:55 +0000
4720
@@ -4,8 +4,10 @@
4721
4
The content of an HTML feed is very similar to an Atom feed, but is formatted
4
The content of an HTML feed is very similar to an Atom feed, but is formatted
4722
5
as HTML instead of Atom.
5
as HTML instead of Atom.
4723
6
6
4726
7
    >>> from BeautifulSoup import BeautifulSoup
7
    >>> from BeautifulSoup import (
4727
8
    >>> from BeautifulSoup import SoupStrainer
8
    ...     BeautifulSoup,
4728
9
    ...     SoupStrainer,
4729
10
    ...     )
4730
9
11
4731
10
Define a helper function for parsing the entries:
12
Define a helper function for parsing the entries:
4732
11
13
4733
12
14
4734
=== modified file 'lib/lp/bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt'
4735
--- lib/lp/bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt	2010-10-06 18:53:53 +0000
4736
+++ lib/lp/bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt	2010-10-21 19:08:55 +0000
4737
@@ -74,8 +74,8 @@
4738
74
Firstly, we appoint Sample Person as the driver for the distribution.
74
Firstly, we appoint Sample Person as the driver for the distribution.
4739
75
75
4740
76
    >>> from canonical.database.sqlbase import flush_database_updates
76
    >>> from canonical.database.sqlbase import flush_database_updates
4743
77
    >>> from canonical.launchpad.interfaces import (
77
    >>> from lp.registry.interfaces.distribution import IDistributionSet
4744
78
    ...     IDistributionSet, IPersonSet)
78
    >>> from lp.registry.interfaces.person import IPersonSet
4745
79
    >>> from canonical.launchpad.ftests import login, logout
79
    >>> from canonical.launchpad.ftests import login, logout
4746
80
    >>> from zope.component import getUtility
80
    >>> from zope.component import getUtility
4747
81
    >>> login('foo.bar@canonical.com')
81
    >>> login('foo.bar@canonical.com')
4748
82
82
4749
=== modified file 'lib/lp/bugs/stories/webservice/xx-bug.txt'
4750
--- lib/lp/bugs/stories/webservice/xx-bug.txt	2010-09-20 19:23:08 +0000
4751
+++ lib/lp/bugs/stories/webservice/xx-bug.txt	2010-10-21 19:08:55 +0000
4752
@@ -116,8 +116,8 @@
4753
116
Activity is recorded and notifications are sent for newly created
116
Activity is recorded and notifications are sent for newly created
4754
117
bugs.
117
bugs.
4755
118
118
4756
119
    >>> from lp.bugs.interfaces.bug import IBugSet
4757
119
    >>> from lp.bugs.model.bugnotification import BugNotification
120
    >>> from lp.bugs.model.bugnotification import BugNotification
4758
120
    >>> from lp.bugs.interfaces.bug import IBugSet
4759
121
    >>> from canonical.launchpad.ftests import ANONYMOUS, login, logout
121
    >>> from canonical.launchpad.ftests import ANONYMOUS, login, logout
4760
122
    >>> from zope.component import getUtility
122
    >>> from zope.component import getUtility
4761
123
123
4762
124
124
4763
=== modified file 'lib/lp/bugs/tests/buglinktarget.txt'
4764
--- lib/lp/bugs/tests/buglinktarget.txt	2010-10-03 15:30:06 +0000
4765
+++ lib/lp/bugs/tests/buglinktarget.txt	2010-10-21 19:08:55 +0000
4766
@@ -16,8 +16,11 @@
4767
16
    # to a registered user.
16
    # to a registered user.
4768
17
    >>> login('no-priv@canonical.com')
17
    >>> login('no-priv@canonical.com')
4769
18
    >>> from zope.interface.verify import verifyObject
18
    >>> from zope.interface.verify import verifyObject
4772
19
    >>> from canonical.launchpad.interfaces import (
19
    >>> from lp.bugs.interfaces.bug import IBugSet
4773
20
    ...     IBugLinkTarget, IBugLink, IBugSet)
20
    >>> from lp.bugs.interfaces.buglink import (
4774
21
    ...     IBugLink,
4775
22
    ...     IBugLinkTarget,
4776
23
    ...     )
4777
21
24
4778
22
    >>> verifyObject(IBugLinkTarget, target)
25
    >>> verifyObject(IBugLinkTarget, target)
4779
23
    True
26
    True
4780
24
27
4781
=== modified file 'lib/lp/bugs/tests/bugs-emailinterface.txt'
4782
--- lib/lp/bugs/tests/bugs-emailinterface.txt	2010-10-09 16:36:22 +0000
4783
+++ lib/lp/bugs/tests/bugs-emailinterface.txt	2010-10-21 19:08:55 +0000
4784
@@ -339,8 +339,7 @@
4785
339
will provide IWeaklyAuthenticatedPrincipal. Let's mark the current
339
will provide IWeaklyAuthenticatedPrincipal. Let's mark the current
4786
340
principal with that.
340
principal with that.
4787
341
341
4790
342
    >>> from canonical.launchpad.interfaces import (
342
    >>> from canonical.launchpad.interfaces.mail import IWeaklyAuthenticatedPrincipal
4789
343
    ...     IWeaklyAuthenticatedPrincipal)
4791
344
    >>> from zope.interface import directlyProvides, directlyProvidedBy
343
    >>> from zope.interface import directlyProvides, directlyProvidedBy
4792
345
    >>> from zope.security.management import queryInteraction
344
    >>> from zope.security.management import queryInteraction
4793
346
    >>> participations = queryInteraction().participations
345
    >>> participations = queryInteraction().participations
4794
@@ -1222,8 +1221,8 @@
4795
1222
bugs directly to series.
1221
bugs directly to series.
4796
1223
1222
4797
1224
    >>> from canonical.config import config
1223
    >>> from canonical.config import config
4798
1225
    >>> from lp.registry.interfaces.distribution import IDistributionSet
4799
1226
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
1224
    >>> from canonical.testing.layers import LaunchpadZopelessLayer
4800
1225
    >>> from lp.registry.interfaces.distribution import IDistributionSet
4801
1227
1226
4802
1228
    # The script's default user doesn't have permission to change the driver.
1227
    # The script's default user doesn't have permission to change the driver.
4803
1229
    >>> commit()
1228
    >>> commit()
4804
@@ -1648,8 +1647,8 @@
4805
1648
The user is a package bug supervisor
1647
The user is a package bug supervisor
4806
1649
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1648
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4807
1650
1649
4810
1651
    >>> from canonical.launchpad.interfaces import (
1650
    >>> from lp.registry.interfaces.distribution import IDistributionSet
4811
1652
    ...     IDistributionSet, ISourcePackageNameSet)
1651
    >>> from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
4812
1653
1652
4813
1654
    >>> commit()
1653
    >>> commit()
4814
1655
    >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
1654
    >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
4815
@@ -2880,8 +2879,8 @@
4816
2880
    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
2879
    >>> from lp.bugs.interfaces.bugtracker import BugTrackerType
4817
2881
    >>> from lp.bugs.tests.externalbugtracker import (
2880
    >>> from lp.bugs.tests.externalbugtracker import (
4818
2882
    ...     new_bugtracker)
2881
    ...     new_bugtracker)
4821
2883
    >>> from canonical.launchpad.interfaces import (
2882
    >>> from lp.bugs.interfaces.bugwatch import IBugWatchSet
4822
2884
    ...     IBugWatchSet, IProductSet)
2883
    >>> from lp.registry.interfaces.product import IProductSet
4823
2885
2884
4824
2886
    >>> firefox = getUtility(IProductSet).getByName('firefox')
2885
    >>> firefox = getUtility(IProductSet).getByName('firefox')
4825
2887
    >>> no_priv = getUtility(IPersonSet).getByName('no-priv')
2886
    >>> no_priv = getUtility(IPersonSet).getByName('no-priv')
4826
2888
2887
4827
=== modified file 'lib/lp/bugs/tests/bugtarget-questiontarget.txt'
4828
--- lib/lp/bugs/tests/bugtarget-questiontarget.txt	2010-10-09 16:36:22 +0000
4829
+++ lib/lp/bugs/tests/bugtarget-questiontarget.txt	2010-10-21 19:08:55 +0000
4830
@@ -13,8 +13,8 @@
4831
13
Product, Distribution, ProductSeries, DistributionSeries,
13
Product, Distribution, ProductSeries, DistributionSeries,
4832
14
SourcePackage, or DistributionSourcePackages.
14
SourcePackage, or DistributionSourcePackages.
4833
15
15
4836
16
    >>> from canonical.launchpad.interfaces import (
16
    >>> from lp.answers.interfaces.questiontarget import IQuestionTarget
4837
17
    ...     IBugTarget, IQuestionTarget)
17
    >>> from lp.bugs.interfaces.bugtarget import IBugTarget
4838
18
18
4839
19
    >>> login('foo.bar@canonical.com')
19
    >>> login('foo.bar@canonical.com')
4840
20
    >>> IBugTarget.providedBy(bugtarget)
20
    >>> IBugTarget.providedBy(bugtarget)
4841
@@ -177,8 +177,9 @@
4842
177
    >>> big_bug = filebug(
177
    >>> big_bug = filebug(
4843
178
    ...     bugtarget, "Print is borked", status=BugTaskStatus.NEW)
178
    ...     bugtarget, "Print is borked", status=BugTaskStatus.NEW)
4844
179
179
4847
180
    >>> from canonical.launchpad.interfaces import (
180
    >>> from lp.bugs.interfaces.bugtask import IBugTaskSet
4848
181
    ...     IBugTaskSet, IDistributionSet, ISourcePackageNameSet)
181
    >>> from lp.registry.interfaces.distribution import IDistributionSet
4849
182
    >>> from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
4850
182
183
4851
183
    >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
184
    >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
4852
184
    >>> evo_ubuntu = getUtility(ISourcePackageNameSet)['evolution']
185
    >>> evo_ubuntu = getUtility(ISourcePackageNameSet)['evolution']
4853
185
186
4854
=== modified file 'lib/lp/code/browser/tests/test_branchlisting.py'
4855
--- lib/lp/code/browser/tests/test_branchlisting.py	2010-08-24 02:21:50 +0000
4856
+++ lib/lp/code/browser/tests/test_branchlisting.py	2010-10-21 19:08:55 +0000
4857
@@ -44,6 +44,7 @@
4858
44
from lp.testing import (
44
from lp.testing import (
4859
45
    BrowserTestCase,
45
    BrowserTestCase,
4860
46
    login_person,
46
    login_person,
4861
47
    normalize_whitespace,
4862
47
    person_logged_in,
48
    person_logged_in,
4863
48
    TestCase,
49
    TestCase,
4864
49
    TestCaseWithFactory,
50
    TestCaseWithFactory,
4865
@@ -421,5 +422,37 @@
4866
421
        self.assertIs(None, branches)
422
        self.assertIs(None, branches)
4867
422
423
4868
423
424
4869
425
class TestProjectBranchListing(TestCaseWithFactory):
4870
426
4871
427
    layer = DatabaseFunctionalLayer
4872
428
4873
429
    def setUp(self):
4874
430
        super(TestProjectBranchListing, self).setUp()
4875
431
        self.project = self.factory.makeProject()
4876
432
        self.product = self.factory.makeProduct(project=self.project)
4877
433
4878
434
    def test_no_branches_gets_message_not_listing(self):
4879
435
        # If there are no product branches on the project's products, then
4880
436
        # the view shows the no code hosting message instead of a listing.
4881
437
        browser = self.getUserBrowser(
4882
438
            canonical_url(self.project, rootsite='code'))
4883
439
        displayname = self.project.displayname
4884
440
        expected_text = normalize_whitespace(
4885
441
                            ("Launchpad does not know where any of %s's "
4886
442
                             "projects host their code." % displayname))
4887
443
        no_branch_div = find_tag_by_id(browser.contents, "no-branchtable")
4888
444
        text = normalize_whitespace(extract_text(no_branch_div))
4889
445
        self.assertEqual(expected_text, text)
4890
446
4891
447
    def test_branches_get_listing(self):
4892
448
        # If a product has a branch, then the project view has a branch
4893
449
        # listing.
4894
450
        branch = self.factory.makeProductBranch(product=self.product)
4895
451
        browser = self.getUserBrowser(
4896
452
            canonical_url(self.project, rootsite='code'))
4897
453
        table = find_tag_by_id(browser.contents, "branchtable")
4898
454
        self.assertIsNot(None, table)
4899
455
4900
456
4901
424
def test_suite():
457
def test_suite():
4902
425
    return unittest.TestLoader().loadTestsFromName(__name__)
458
    return unittest.TestLoader().loadTestsFromName(__name__)
4903
426
459
4904
=== modified file 'lib/lp/code/doc/branch-merge-proposal-notifications.txt'
4905
--- lib/lp/code/doc/branch-merge-proposal-notifications.txt	2010-05-27 02:04:21 +0000
4906
+++ lib/lp/code/doc/branch-merge-proposal-notifications.txt	2010-10-21 19:08:55 +0000
4907
@@ -9,8 +9,8 @@
4908
9
When subscribers subscribe to branches, they can specify what level of
9
When subscribers subscribe to branches, they can specify what level of
4909
10
notification they would like to receive.
10
notification they would like to receive.
4910
11
11
4911
12
    >>> from zope.security.proxy import removeSecurityProxy
4912
12
    >>> from difflib import unified_diff
13
    >>> from difflib import unified_diff
4913
13
    >>> from zope.security.proxy import removeSecurityProxy
4914
14
    >>> from lp.code.enums import (
14
    >>> from lp.code.enums import (
4915
15
    ...     BranchSubscriptionDiffSize, BranchSubscriptionNotificationLevel,
15
    ...     BranchSubscriptionDiffSize, BranchSubscriptionNotificationLevel,
4916
16
    ...     CodeReviewNotificationLevel)
16
    ...     CodeReviewNotificationLevel)
4917
@@ -101,7 +101,7 @@
4918
101
    ...     displayname="Eric", email="eric@example.com")
101
    ...     displayname="Eric", email="eric@example.com")
4919
102
    >>> # To avoid needing to access branches, pre-populate diffs.
102
    >>> # To avoid needing to access branches, pre-populate diffs.
4920
103
    >>> bmp = source_branch.addLandingTarget(
103
    >>> bmp = source_branch.addLandingTarget(
4922
104
    ...     registrant, target_branch)
104
    ...     registrant, target_branch, needs_review=True)
4923
105
    >>> removeSecurityProxy(bmp).preview_diff = preview_diff
105
    >>> removeSecurityProxy(bmp).preview_diff = preview_diff
4924
106
    >>> # Fake the update preview diff as done.
106
    >>> # Fake the update preview diff as done.
4925
107
    >>> bmp.next_preview_diff_job.start()
107
    >>> bmp.next_preview_diff_job.start()
4926
@@ -156,7 +156,8 @@
4927
156
    >>> bmp.deleteProposal()
156
    >>> bmp.deleteProposal()
4928
157
    >>> bmp = source_branch.addLandingTarget(
157
    >>> bmp = source_branch.addLandingTarget(
4929
158
    ...     registrant, target_branch,
158
    ...     registrant, target_branch,
4931
159
    ...     description=initial_comment, review_requests=reviewers)
159
    ...     description=initial_comment, review_requests=reviewers,
4932
160
    ...     needs_review=True)
4933
160
    >>> removeSecurityProxy(bmp).preview_diff = preview_diff
161
    >>> removeSecurityProxy(bmp).preview_diff = preview_diff
4934
161
    >>> # Fake the update preview diff as done.
162
    >>> # Fake the update preview diff as done.
4935
162
    >>> bmp.next_preview_diff_job.start()
163
    >>> bmp.next_preview_diff_job.start()
4936
163
164
4937
=== modified file 'lib/lp/code/doc/branch-visibility.txt'
4938
--- lib/lp/code/doc/branch-visibility.txt	2010-10-03 15:30:06 +0000
4939
+++ lib/lp/code/doc/branch-visibility.txt	2010-10-21 19:08:55 +0000
4940
@@ -60,8 +60,8 @@
4941
60
AccessBranch authorization class is used to authorize users for the
60
AccessBranch authorization class is used to authorize users for the
4942
61
combination of the launchpad.View permission and the IBranch interface.
61
combination of the launchpad.View permission and the IBranch interface.
4943
62
62
4944
63
    >>> from zope.component import getAdapter
4945
63
    >>> from canonical.launchpad.webapp.interfaces import IAuthorization
64
    >>> from canonical.launchpad.webapp.interfaces import IAuthorization
4946
64
    >>> from zope.component import getAdapter
4947
65
    >>> getAdapter(branch, IAuthorization, name='launchpad.View')
65
    >>> getAdapter(branch, IAuthorization, name='launchpad.View')
4948
66
    <canonical.launchpad.security.AccessBranch ...>
66
    <canonical.launchpad.security.AccessBranch ...>
4949
67
67
4950
68
68
4951
=== modified file 'lib/lp/code/doc/codeimport-event.txt'
4952
--- lib/lp/code/doc/codeimport-event.txt	2010-10-03 15:30:06 +0000
4953
+++ lib/lp/code/doc/codeimport-event.txt	2010-10-21 19:08:55 +0000
4954
@@ -19,8 +19,8 @@
4955
19
ICodeImportEventSet utility.
19
ICodeImportEventSet utility.
4956
20
20
4957
21
    >>> from zope.component import getUtility
21
    >>> from zope.component import getUtility
4958
22
    >>> from zope.security.proxy import removeSecurityProxy
4959
22
    >>> from canonical.launchpad.webapp.testing import verifyObject
23
    >>> from canonical.launchpad.webapp.testing import verifyObject
4960
23
    >>> from zope.security.proxy import removeSecurityProxy
4961
24
    >>> from lp.code.interfaces.codeimportevent import ICodeImportEventSet
24
    >>> from lp.code.interfaces.codeimportevent import ICodeImportEventSet
4962
25
    >>> event_set = getUtility(ICodeImportEventSet)
25
    >>> event_set = getUtility(ICodeImportEventSet)
4963
26
    >>> verifyObject(ICodeImportEventSet, removeSecurityProxy(event_set))
26
    >>> verifyObject(ICodeImportEventSet, removeSecurityProxy(event_set))
4964
27
27
4965
=== modified file 'lib/lp/code/doc/codeimport-job.txt'
4966
--- lib/lp/code/doc/codeimport-job.txt	2009-06-12 16:36:02 +0000
4967
+++ lib/lp/code/doc/codeimport-job.txt	2010-10-21 19:08:55 +0000
4968
@@ -49,8 +49,8 @@
4969
49
49
4970
50
There are two CodeImport objects of interest in the sample data.
50
There are two CodeImport objects of interest in the sample data.
4971
51
51
4972
52
    >>> from lp.code.interfaces.codeimport import ICodeImportSet
4973
53
    >>> from lp.code.interfaces.branchlookup import IBranchLookup
52
    >>> from lp.code.interfaces.branchlookup import IBranchLookup
4974
53
    >>> from lp.code.interfaces.codeimport import ICodeImportSet
4975
54
    >>> branch_lookup = getUtility(IBranchLookup)
54
    >>> branch_lookup = getUtility(IBranchLookup)
4976
55
    >>> code_import_set = getUtility(ICodeImportSet)
55
    >>> code_import_set = getUtility(ICodeImportSet)
4977
56
56
4978
57
57
4979
=== modified file 'lib/lp/code/doc/codeimport.txt'
4980
--- lib/lp/code/doc/codeimport.txt	2010-10-03 15:30:06 +0000
4981
+++ lib/lp/code/doc/codeimport.txt	2010-10-21 19:08:55 +0000
4982
@@ -23,9 +23,9 @@
4983
23
23
4984
24
    >>> from lp.code.interfaces.branchtarget import IBranchTarget
24
    >>> from lp.code.interfaces.branchtarget import IBranchTarget
4985
25
    >>> from lp.code.interfaces.codeimport import ICodeImport, ICodeImportSet
25
    >>> from lp.code.interfaces.codeimport import ICodeImport, ICodeImportSet
4986
26
    >>> from canonical.launchpad.webapp.testing import verifyObject
4987
27
    >>> from zope.component import getUtility
26
    >>> from zope.component import getUtility
4988
28
    >>> from zope.security.proxy import removeSecurityProxy
27
    >>> from zope.security.proxy import removeSecurityProxy
4989
28
    >>> from canonical.launchpad.webapp.testing import verifyObject
4990
29
    >>> code_import_set = getUtility(ICodeImportSet)
29
    >>> code_import_set = getUtility(ICodeImportSet)
4991
30
    >>> verifyObject(ICodeImportSet, removeSecurityProxy(code_import_set))
30
    >>> verifyObject(ICodeImportSet, removeSecurityProxy(code_import_set))
4992
31
    True
31
    True
4993
@@ -341,8 +341,8 @@
4994
341
There is a separate default update interval for each version control system,
341
There is a separate default update interval for each version control system,
4995
342
set in the Launchpad configuration system.
342
set in the Launchpad configuration system.
4996
343
343
4997
344
    >>> from canonical.config import config
4998
344
    >>> from datetime import timedelta
345
    >>> from datetime import timedelta
4999
345
    >>> from canonical.config import config
5000
346
    >>> default_interval_cvs = timedelta(
346
    >>> default_interval_cvs = timedelta(
Reviewer	Review Type	Date Requested	Status
Curtis Hovey (community)	ui	2010-10-19	Approve on 2010-10-20
Guilherme Salgado (community)	ui*	2010-10-19	Approve on 2010-10-20
Māris Fogels (community)		2010-10-19	Approve on 2010-10-19
Review via email: mp+38836@code.launchpad.net