Merge ~jugmac00/launchpad:update-social-media-contacts into launchpad:master

[Jürgen Gmach]

Add Mastodon account for status updates

98937d5... by Jürgen Gmach on 2023-02-01

Make blackdoc linter happy

[Jürgen Gmach (jugmac00)]

When reviewing, please review each commit on its own.

For "reasons" many unrelated linter issues popped up, which I fixed in a separate commit.

[Colin Watson (cjwatson)]

review: Approve

[Jürgen Gmach (jugmac00)]

Thanks for the review.

751a55d... by Jürgen Gmach on 2023-02-01

Apply feedback from review

diff --git a/lib/canonical/launchpad/offline-maintenance-haproxy.html b/lib/canonical/launchpad/offline-maintenance-haproxy.html
index 329ae2e..30707bc 100644
--- a/lib/canonical/launchpad/offline-maintenance-haproxy.html
+++ b/lib/canonical/launchpad/offline-maintenance-haproxy.html
@@ -31,7 +31,9 @@ Content-Type: text/html
             <p>
               We'll be back soon. Check
               <a href="https://twitter.com/launchpadstatus">@launchpadstatus</a>
-              on Twitter for updates.
+              on Twitter or
+              <a href="https://ubuntu.social/@launchpadstatus">@[e-mail]</a>
+              on Mastodon for updates.
             </p>
             <p><a href="javascript:window.location.reload()">Reload</a>
               this page or try again in a few minutes</p>
diff --git a/lib/canonical/launchpad/offline-maintenance.html b/lib/canonical/launchpad/offline-maintenance.html
index 2ed31ff..7f46f5c 100644
--- a/lib/canonical/launchpad/offline-maintenance.html
+++ b/lib/canonical/launchpad/offline-maintenance.html
@@ -24,7 +24,9 @@
             <p>
               We'll be back soon. Check
               <a href="https://twitter.com/launchpadstatus">@launchpadstatus</a>
-              on Twitter for updates.
+              on Twitter or
+              <a href="https://ubuntu.social/@launchpadstatus">@[e-mail]</a>
+              on Mastodon for updates.
             </p>
             <p><a href="javascript:window.location.reload()">Reload</a>
               this page or try again in a few minutes</p>
diff --git a/lib/canonical/launchpad/offline-unplanned-haproxy.html b/lib/canonical/launchpad/offline-unplanned-haproxy.html
index 04965a0..9e59137 100644
--- a/lib/canonical/launchpad/offline-unplanned-haproxy.html
+++ b/lib/canonical/launchpad/offline-unplanned-haproxy.html
@@ -33,7 +33,9 @@ Content-Type: text/html
               back in a couple of minutes.  Otherwise, we are working to
               fix the unexpected problems. Check
               <a href="https://twitter.com/launchpadstatus">@launchpadstatus</a>
-              on Twitter for updates.
+              on Twitter or
+              <a href="https://ubuntu.social/@launchpadstatus">@[e-mail]</a>
+              on Mastodon for updates.
             </p>
             <p>
               If the problem persists, let us know in
diff --git a/lib/canonical/launchpad/offline-unplanned.html b/lib/canonical/launchpad/offline-unplanned.html
index ef1717a..4d8687c 100644
--- a/lib/canonical/launchpad/offline-unplanned.html
+++ b/lib/canonical/launchpad/offline-unplanned.html
@@ -26,7 +26,9 @@
               back in a couple of minutes.  Otherwise, we are working to
               fix the unexpected problems. Check
               <a href="https://twitter.com/launchpadstatus">@launchpadstatus</a>
-              on Twitter for updates.
+              on Twitter or
+              <a href="https://ubuntu.social/@launchpadstatus">@[e-mail]</a>
+              on Mastodon for updates.
             </p>
             <p>
               If the problem persists, let us know in
diff --git a/lib/lp/answers/browser/tests/views.rst b/lib/lp/answers/browser/tests/views.rst
index 70a10a6..5f58b10 100644
--- a/lib/lp/answers/browser/tests/views.rst
+++ b/lib/lp/answers/browser/tests/views.rst
@@ -851,7 +851,6 @@ keeping those searchable.
 
     >>> from lp.answers.browser.questiontarget import SearchQuestionsView
     >>> class MyCustomSearchQuestionsView(SearchQuestionsView):
-    ...
     ...     default_filter = {}
     ...
     ...     def getDefaultFilter(self):
diff --git a/lib/lp/app/browser/doc/base-layout.rst b/lib/lp/app/browser/doc/base-layout.rst
index c9d4758..bf4c87a 100644
--- a/lib/lp/app/browser/doc/base-layout.rst
+++ b/lib/lp/app/browser/doc/base-layout.rst
@@ -162,7 +162,7 @@ Page Footers
     Contact Launchpad Support /feedback
     Blog http://blog.launchpad.net/
     Careers https://canonical.com/careers
-    System status https://twitter.com/launchpadstatus
+    System status https://ubuntu.social/@launchpadstatus
     Get the code! https://dev.launchpad.net/
 
 
diff --git a/lib/lp/app/doc/menus.rst b/lib/lp/app/doc/menus.rst
index 3534dba..03ceb92 100644
--- a/lib/lp/app/doc/menus.rst
+++ b/lib/lp/app/doc/menus.rst
@@ -252,7 +252,6 @@ are appropriate for a context object.
     >>> from lp.services.webapp import Link
 
     >>> class CookeryFacetMenu(FacetMenu):
-    ...
     ...     usedfor = ICookbook
     ...     links = ["summary", "questions", "variations"]
     ...     defaultlink = "summary"
@@ -496,7 +495,6 @@ The RecipeFacetMenu subclass defined below only applies to IRecipe
 content object and it has all facet links enabled.
 
     >>> class RecipeFacetMenu(CookeryFacetMenu):
-    ...
     ...     usedfor = IRecipe
     ...     enable_only = ["summary", "questions", "variations"]
     ...
@@ -568,7 +566,6 @@ links. CookeryFacetMenu did not include 'non_link' in its links, so an
 error is raised when BogusFacetMenu is used.
 
     >>> class BogusFacetMenu(CookeryFacetMenu):
-    ...
     ...     usedfor = IRecipe
     ...     enable_only = ["summary", "non_link"]
     ...
diff --git a/lib/lp/app/doc/tales.rst b/lib/lp/app/doc/tales.rst
index 162b579..e872cff 100644
--- a/lib/lp/app/doc/tales.rst
+++ b/lib/lp/app/doc/tales.rst
@@ -1485,7 +1485,6 @@ Make a mock-up IBrowserRequest, and use this as the interaction.
     ...     ILaunchpadBrowserApplicationRequest,
     ... )
     ... class MockBrowserRequest:
-    ...
     ...     interaction = None
     ...     principal = None
     ...
diff --git a/lib/lp/app/templates/base-layout-macros.pt b/lib/lp/app/templates/base-layout-macros.pt
index 54980ff..e9c2b1d 100644
--- a/lib/lp/app/templates/base-layout-macros.pt
+++ b/lib/lp/app/templates/base-layout-macros.pt
@@ -305,8 +305,7 @@
 		>Careers</a>
       </tal:careers_link>
       &nbsp;&bull;&nbsp;
-      <a href="https://twitter.com/launchpadstatus"
-        >System status</a>
+      <a href="https://ubuntu.social/@launchpadstatus">System status</a>
       <span id="lp-version">
       &nbsp;&bull;&nbsp;
         <tal:display_revision replace="display_revision" />
diff --git a/lib/lp/app/templates/launchpad-databaseunavailable.pt b/lib/lp/app/templates/launchpad-databaseunavailable.pt
index 1e7d025..1c8a80c 100644
--- a/lib/lp/app/templates/launchpad-databaseunavailable.pt
+++ b/lib/lp/app/templates/launchpad-databaseunavailable.pt
@@ -27,7 +27,9 @@
               back in a couple of minutes.  Otherwise, we are working to
               fix the unexpected problems. Check
               <a href="https://twitter.com/launchpadstatus">@launchpadstatus</a>
-              on Twitter for updates.
+              on Twitter or
+              <a href="https://ubuntu.social/@launchpadstatus">@[e-mail]</a>
+              on Mastodon for updates.
             </p>
             <p>
               If the problem persists, let us know in
diff --git a/lib/lp/bugs/doc/bug-change.rst b/lib/lp/bugs/doc/bug-change.rst
index 5414629..de42def 100644
--- a/lib/lp/bugs/doc/bug-change.rst
+++ b/lib/lp/bugs/doc/bug-change.rst
@@ -71,7 +71,6 @@ We'll create a test class that actually implements the methods we need.
     >>> recipients.addDirectSubscriber(example_person_2)
 
     >>> class TestBugChange(BugChangeBase):
-    ...
     ...     bug_activity_data = {
     ...         "whatchanged": "Nothing",
     ...         "oldvalue": "OldValue",
@@ -217,7 +216,6 @@ If you try to send a notification without adding a text body for the
 notification you'll get an error.
 
     >>> class NoNotificationTextBugChange(TestBugChange):
-    ...
     ...     bug_notification_data = {
     ...         "text": None,
     ...     }
diff --git a/lib/lp/bugs/doc/checkwatches.rst b/lib/lp/bugs/doc/checkwatches.rst
index 47205b8..6969dc5 100644
--- a/lib/lp/bugs/doc/checkwatches.rst
+++ b/lib/lp/bugs/doc/checkwatches.rst
@@ -344,7 +344,6 @@ We'll create a non-functioning ExternalBugtracker to demonstrate this.
     ...     ISupportsCommentPushing,
     ... )
     ... class UselessExternalBugTracker(ExternalBugTracker):
-    ...
     ...     batch_size = BATCH_SIZE_UNLIMITED
     ...
     ...     def initializeRemoteBugDB(self, bug_ids):
diff --git a/lib/lp/bugs/doc/cve.rst b/lib/lp/bugs/doc/cve.rst
index 8adeabf..e06fe5f 100644
--- a/lib/lp/bugs/doc/cve.rst
+++ b/lib/lp/bugs/doc/cve.rst
@@ -173,7 +173,7 @@ ICveSet.getBugCvesForBugTasks:
     >>> ubuntu = Distribution.selectOneBy(name="ubuntu")
     >>> ubuntu_tasks = ubuntu.searchTasks(params)
     >>> bugcves = cveset.getBugCvesForBugTasks(ubuntu_tasks)
-    >>> for (bug, cve) in bugcves:
+    >>> for bug, cve in bugcves:
     ...     print("%d: %s" % (bug.id, cve.title))
     ...
     1: CVE-1999-8979 (Entry)
diff --git a/lib/lp/bugs/doc/externalbugtracker-bug-imports.rst b/lib/lp/bugs/doc/externalbugtracker-bug-imports.rst
index 574e139..9eee801 100644
--- a/lib/lp/bugs/doc/externalbugtracker-bug-imports.rst
+++ b/lib/lp/bugs/doc/externalbugtracker-bug-imports.rst
@@ -11,7 +11,6 @@ methods.
     >>> from lp.bugs.externalbugtracker import ExternalBugTracker
     >>> @implementer(ISupportsBugImport)
     ... class BugImportingExternalBugTracker(ExternalBugTracker):
-    ...
     ...     _bugs = {}
     ...
     ...     def getBugReporter(self, remote_bug):
diff --git a/lib/lp/bugs/doc/externalbugtracker-bugzilla-api.rst b/lib/lp/bugs/doc/externalbugtracker-bugzilla-api.rst
index 9e5a378..d647a20 100644
--- a/lib/lp/bugs/doc/externalbugtracker-bugzilla-api.rst
+++ b/lib/lp/bugs/doc/externalbugtracker-bugzilla-api.rst
@@ -77,7 +77,6 @@ Trying to log in to a Bugzilla with incorrect credentials will also
 raise an error.
 
     >>> class BadCredentialsBugzillaAPI(BugzillaAPI):
-    ...
     ...     credentials = {"login": "fail", "password": "fail"}
     ...
 
diff --git a/lib/lp/bugs/doc/externalbugtracker-bugzilla.rst b/lib/lp/bugs/doc/externalbugtracker-bugzilla.rst
index 5f8ca79..f3f09ab 100644
--- a/lib/lp/bugs/doc/externalbugtracker-bugzilla.rst
+++ b/lib/lp/bugs/doc/externalbugtracker-bugzilla.rst
@@ -89,7 +89,6 @@ we override for the purpose of this test.
 
     >>> import xmlrpc.client
     >>> class FailingXMLRPCTransport(xmlrpc.client.Transport):
-    ...
     ...     error = xmlrpc.client.Fault(
     ...         xmlrpc.client.METHOD_NOT_FOUND, "Method doesn't exist"
     ...     )
@@ -105,7 +104,6 @@ we override for the purpose of this test.
     >>> test_transport = FailingXMLRPCTransport()
 
     >>> class BugzillaWithFakeProxy(Bugzilla):
-    ...
     ...     _test_xmlrpc_proxy = xmlrpc.client.ServerProxy(
     ...         "http://example.com/xmlrpc.cgi", transport=test_transport
     ...     )
@@ -181,7 +179,6 @@ BuzillaAPI will be returned. To test this, we use a specially-crafted
 XML-RPC proxy that behaves like a Bugzilla 3.4 instance.
 
     >>> class APIXMLRPCTransport(xmlrpc.client.Transport):
-    ...
     ...     version = "3.4.2"
     ...
     ...     def request(self, host, handler, request, verbose=None):
diff --git a/lib/lp/bugs/doc/externalbugtracker-comment-imports.rst b/lib/lp/bugs/doc/externalbugtracker-comment-imports.rst
index 257c3d8..240edbc 100644
--- a/lib/lp/bugs/doc/externalbugtracker-comment-imports.rst
+++ b/lib/lp/bugs/doc/externalbugtracker-comment-imports.rst
@@ -50,7 +50,6 @@ ExternalBugTracker class which implements these three methods.
     ... )
     >>> @implementer(ISupportsCommentImport)
     ... class CommentImportingExternalBugTracker(ExternalBugTracker):
-    ...
     ...     comment_dict = {}
     ...     remote_comments = {
     ...         "1": "Example comment the first",
diff --git a/lib/lp/bugs/doc/externalbugtracker-comment-pushing.rst b/lib/lp/bugs/doc/externalbugtracker-comment-pushing.rst
index 56c1374..e73a4af 100644
--- a/lib/lp/bugs/doc/externalbugtracker-comment-pushing.rst
+++ b/lib/lp/bugs/doc/externalbugtracker-comment-pushing.rst
@@ -60,7 +60,6 @@ ISupportsCommentPushing interface.
 
     >>> @implementer(ISupportsCommentPushing)
     ... class CommentPushingExternalBugTracker(ExternalBugTracker):
-    ...
     ...     next_comment_id = 1
     ...     remote_comments = {}
     ...
@@ -216,7 +215,6 @@ example ExternalBugTracker that does comment importing.
     ... class CommentImportingExternalBugTracker(
     ...     CommentPushingExternalBugTracker
     ... ):
-    ...
     ...     external_comment_dict = {
     ...         "4": "External comment 1.",
     ...         "5": "External comment 2.",
diff --git a/lib/lp/bugs/doc/externalbugtracker.rst b/lib/lp/bugs/doc/externalbugtracker.rst
index 94164ef..fe920fb 100644
--- a/lib/lp/bugs/doc/externalbugtracker.rst
+++ b/lib/lp/bugs/doc/externalbugtracker.rst
@@ -181,7 +181,6 @@ Firstly, we'll subclass BugzillaAPI so that we don't have to
 connect to any servers.
 
     >>> class ProductQueryingBugzillaAPI(BugzillaAPI):
-    ...
     ...     remote_bug_products = {
     ...         1: "HeartOfGold",
     ...         2: "InfiniteImprobabilityDrive",
@@ -994,7 +993,6 @@ We'll create some example unchecked watches as well as some watches with
 comments to push in order to demonstrate this.
 
     >>> class SmallBatchExternalBugTracker(TimeUnknownExternalBugTracker):
-    ...
     ...     batch_size = 5
     ...
     >>> external_bugtracker = SmallBatchExternalBugTracker(
diff --git a/lib/lp/bugs/doc/product-update-remote-product.rst b/lib/lp/bugs/doc/product-update-remote-product.rst
index b4b26ff..fb37a14 100644
--- a/lib/lp/bugs/doc/product-update-remote-product.rst
+++ b/lib/lp/bugs/doc/product-update-remote-product.rst
@@ -52,7 +52,6 @@ ExternalBugTracker that doesn't require network access.
 
 
     >>> class NoNetworkRemoteProductUpdater(RemoteProductUpdater):
-    ...
     ...     external_bugtracker_to_return = FakeExternalBugTracker
     ...
     ...     def _getExternalBugTracker(self, bug_tracker):
diff --git a/lib/lp/registry/doc/distribution-mirror.rst b/lib/lp/registry/doc/distribution-mirror.rst
index 5fd9798..17f4e79 100644
--- a/lib/lp/registry/doc/distribution-mirror.rst
+++ b/lib/lp/registry/doc/distribution-mirror.rst
@@ -482,7 +482,7 @@ IDistributionMirror.
 
     >>> mirror = mirrorset.getByName("archive-mirror2")
     >>> paths = mirror.getExpectedPackagesPaths()
-    >>> for (series, pocket, component, path) in paths:
+    >>> for series, pocket, component, path in paths:
     ...     print(path)
     ...
     dists/breezy-autotest/main/binary-i386/Packages.gz
@@ -529,7 +529,7 @@ IDistributionMirror.
     >>> warty.status = SeriesStatus.OBSOLETE
 
     >>> paths = mirror.getExpectedSourcesPaths()
-    >>> for (series, pocket, component, path) in paths:
+    >>> for series, pocket, component, path in paths:
     ...     print(path)
     ...
     dists/breezy-autotest/main/source/Sources.gz
@@ -577,7 +577,7 @@ config.distributionmirrorprober.releases_file_list_url option)
     >>> from lp.registry.scripts.distributionmirror_prober import (
     ...     get_expected_cdimage_paths,
     ... )
-    >>> for (series, flavour, paths) in get_expected_cdimage_paths():
+    >>> for series, flavour, paths in get_expected_cdimage_paths():
     ...     for path in paths:
     ...         print(series.name, flavour, path)
     ...
@@ -626,7 +626,7 @@ checked if that mirror's last sync was in the last one or two days.
 
     >>> when = datetime(2005, 9, 17, tzinfo=utc)
     >>> urls = warty_mirror.getURLsToCheckUpdateness(when=when)
-    >>> for (freshness, url) in urls.items():
+    >>> for freshness, url in urls.items():
     ...     print("%s: %s" % (freshness.name, url))  # noqa
     ...
     UP: http://foo.bar.com/pub/pool/main/a/alsa-utils/alsa-utils_1.0.9a-4.dsc
@@ -638,7 +638,7 @@ last upload was mirrored and then mark the mirror as up-to-date. This is
 because there were no recent uploads there.
 
     >>> urls = warty_mirror.getURLsToCheckUpdateness()
-    >>> for (freshness, url) in urls.items():
+    >>> for freshness, url in urls.items():
     ...     print("%s: %s" % (freshness.name, url))
     ...
     UP: http://foo.bar.com/pub/pool/main/c/cdrkit/foobar-1.0.dsc
@@ -654,7 +654,7 @@ If the mirror has no HTTP base url, we'll use the FTP one.
     ...     "ftp://foo.bar.com/pub"
     ... )
     >>> urls = warty_mirror.getURLsToCheckUpdateness()
-    >>> for (freshness, url) in urls.items():
+    >>> for freshness, url in urls.items():
     ...     print("%s: %s" % (freshness.name, url))
     ...
     UP: ftp://foo.bar.com/pub/pool/main/c/cdrkit/foobar-1.0.dsc
@@ -697,7 +697,7 @@ so we need to skip that upload.
 
     >>> when = datetime(2005, 6, 22, tzinfo=utc)
     >>> urls = warty_i386_mirror.getURLsToCheckUpdateness(when=when)
-    >>> for (freshness, url) in urls.items():
+    >>> for freshness, url in urls.items():
     ...     print("%s: %s" % (freshness.name, url))  # noqa
     ...
     UP: http://foo.bar.com/pub/pool/main/p/pmount/pmount_1.9-1_all.deb
@@ -706,7 +706,7 @@ so we need to skip that upload.
 
     >>> when = datetime(2005, 6, 20, 0, 1, tzinfo=utc)
     >>> urls = warty_i386_mirror.getURLsToCheckUpdateness(when=when)
-    >>> for (freshness, url) in urls.items():
+    >>> for freshness, url in urls.items():
     ...     print("%s: %s" % (freshness.name, url))  # noqa
     ...
     UP: http://foo.bar.com/pub/pool/main/p/pmount/pmount_1.9-1_all.deb
@@ -722,7 +722,7 @@ If the mirror has no HTTP base url, we'll use the FTP one.
     ...     "ftp://foo.bar.com/pub"
     ... )
     >>> urls = warty_i386_mirror.getURLsToCheckUpdateness()
-    >>> for (freshness, url) in urls.items():
+    >>> for freshness, url in urls.items():
     ...     print("%s: %s" % (freshness.name, url))
     ...
     UP: ftp://foo.bar.com/pub/pool/main/c/cdrkit/foobar_1.0_all.deb
diff --git a/lib/lp/registry/tests/person_from_principal.rst b/lib/lp/registry/tests/person_from_principal.rst
index 9f729e0..ad61707 100644
--- a/lib/lp/registry/tests/person_from_principal.rst
+++ b/lib/lp/registry/tests/person_from_principal.rst
@@ -25,7 +25,6 @@ time we adapt.
     >>> cached_person = object()
     >>> @implementer(ILaunchpadPrincipal)
     ... class LaunchpadPrincipal:
-    ...
     ...     person = cached_person
     ...
 
diff --git a/lib/lp/services/librarianserver/web.py b/lib/lp/services/librarianserver/web.py
index 17a356e..23f6555 100644
--- a/lib/lp/services/librarianserver/web.py
+++ b/lib/lp/services/librarianserver/web.py
@@ -148,6 +148,7 @@ class LibraryFileAliasResource(resource.Resource):
                 "Database unavailable",
                 "A required database is unavailable.\n"
                 "See https://twitter.com/launchpadstatus "
+                "or https://ubuntu.social/@launchpadstatus "
                 "for maintenance and outage notifications.",
             )
         else:
diff --git a/lib/lp/services/webapp/doc/menus.rst b/lib/lp/services/webapp/doc/menus.rst
index f11fad5..23358a0 100644
--- a/lib/lp/services/webapp/doc/menus.rst
+++ b/lib/lp/services/webapp/doc/menus.rst
@@ -468,7 +468,6 @@ in practice because we need to know how to register our menu as an
 adapter.  For this part of the test, we won't worry about that.
 
     >>> class FooApplicationMenu(ApplicationMenu):
-    ...
     ...     links = ["first"]
     ...     facet = "foo"
     ...
@@ -540,7 +539,6 @@ tells the registration machinery how to render this menu as an adapter.
 For this part of the test, we won't worry about that.
 
     >>> class MyContextMenu(ContextMenu):
-    ...
     ...     links = ["first"]
     ...
     ...     def first(self):
@@ -725,7 +723,6 @@ link should appear linked. The request is also set as the menu's
     >>> from lp.services.webapp.vhosts import allvhosts
     >>> @implementer(IHTTPApplicationRequest, IBrowserRequest)
     ... class FakeRequest:
-    ...
     ...     interaction = None
     ...
     ...     def __init__(self, url, query=None, url1=None):
diff --git a/lib/lp/services/webapp/doc/navigation.rst b/lib/lp/services/webapp/doc/navigation.rst
index 2cf30a4..eef1360 100644
--- a/lib/lp/services/webapp/doc/navigation.rst
+++ b/lib/lp/services/webapp/doc/navigation.rst
@@ -74,7 +74,6 @@ interface, we'll define one here.
     >>> from zope.publisher.interfaces.browser import IBrowserRequest
 
     >>> class Response:
-    ...
     ...     redirected_to = None
     ...     status = None
     ...
@@ -139,7 +138,6 @@ interface, we'll define one here.
     >>> request = Request()
 
     >>> class IThing(Interface):
-    ...
     ...     value = Attribute("the value of the thing")
     ...
 
@@ -211,7 +209,6 @@ which return None to indicate 'not found' and some that raise NotFoundError.
 
 
     >>> class ThingSetNavigation(Navigation):
-    ...
     ...     usedfor = IThingSet
     ...
     ...     newlayer = INewLayer
diff --git a/lib/lp/translations/doc/translationgroup.rst b/lib/lp/translations/doc/translationgroup.rst
index 075a4ae..db94a6b 100644
--- a/lib/lp/translations/doc/translationgroup.rst
+++ b/lib/lp/translations/doc/translationgroup.rst
@@ -188,7 +188,7 @@ The method returns tuples of respectively a Translator ("translation
 group membership entry"), its language, and the actual team or person
 assigned to that language.
 
-    >>> for (translator, language, team) in group.fetchTranslatorData():
+    >>> for translator, language, team in group.fetchTranslatorData():
     ...     print(translator.language.code, language.code, team.name)
     ...
     nl nl nl-team
@@ -197,7 +197,7 @@ assigned to that language.
 
 The members are sorted by language name in English.
 
-    >>> for (translator, language, person) in group.fetchTranslatorData():
+    >>> for translator, language, person in group.fetchTranslatorData():
     ...     print(language.englishname)
     ...
     Dutch