Merge ~cjwatson/launchpad:fix-mypy into launchpad:master

[Colin Watson]

Fix some test failures caused by type-checking changes

There were three separate problems here. Full details in the individual commit messages.

[Andrey Fedoseev (andrey-fedoseev)]

Great, thank you for fixing that!

review: Approve

diff --git a/lib/lp/bugs/browser/bug.py b/lib/lp/bugs/browser/bug.py
index 028b4e8..3a675a8 100644
--- a/lib/lp/bugs/browser/bug.py
+++ b/lib/lp/bugs/browser/bug.py
@@ -411,11 +411,6 @@ class MaloneView(LaunchpadFormView):
 
     page_title = "Launchpad Bugs"
 
-    # Test: standalone/xx-slash-malone-slash-bugs.rst
-    @property
-    def error_message(self):
-        return None
-
     @property
     def target_css_class(self):
         """The CSS class for used in the target widget."""
@@ -441,7 +436,9 @@ class MaloneView(LaunchpadFormView):
     def _redirectToBug(self, bug_id):
         """Redirect to the specified bug id."""
         if not isinstance(bug_id, str):
-            self.error_message = "Bug %r is not registered." % bug_id
+            self.error_message = structured(
+                "Bug %r is not registered.", bug_id
+            )
             return
         if bug_id.startswith("#"):
             # Be nice to users and chop off leading hashes
@@ -449,7 +446,9 @@ class MaloneView(LaunchpadFormView):
         try:
             bug = getUtility(IBugSet).getByNameOrID(bug_id)
         except NotFoundError:
-            self.error_message = "Bug %r is not registered." % bug_id
+            self.error_message = structured(
+                "Bug %r is not registered.", bug_id
+            )
         else:
             return self.request.response.redirect(canonical_url(bug))
 
diff --git a/lib/lp/bugs/browser/tests/test_bugs.py b/lib/lp/bugs/browser/tests/test_bugs.py
index 9801551..ecee498 100644
--- a/lib/lp/bugs/browser/tests/test_bugs.py
+++ b/lib/lp/bugs/browser/tests/test_bugs.py
@@ -63,7 +63,9 @@ class TestMaloneView(TestCaseWithFactory):
         view = create_initialized_view(
             self.application, name="+index", form=form
         )
-        self.assertEqual("Bug 'fnord' is not registered.", view.error_message)
+        self.assertEqual(
+            "Bug 'fnord' is not registered.", view.error_message.escapedtext
+        )
         self.assertEqual(None, view.request.response.getHeader("Location"))
 
     def test_redirect_list_of_bug_fail(self):
@@ -74,7 +76,8 @@ class TestMaloneView(TestCaseWithFactory):
             self.application, name="+index", form=form
         )
         self.assertEqual(
-            "Bug ['fnord', 'pting'] is not registered.", view.error_message
+            "Bug '['fnord', 'pting']' is not registered.",
+            view.error_message.escapedtext,
         )
         self.assertEqual(None, view.request.response.getHeader("Location"))
 
diff --git a/lib/lp/bugs/templates/malone-index.pt b/lib/lp/bugs/templates/malone-index.pt
index c82e296..454aedc 100644
--- a/lib/lp/bugs/templates/malone-index.pt
+++ b/lib/lp/bugs/templates/malone-index.pt
@@ -13,7 +13,7 @@
     <div class="top-portlet">
       <p class="error message"
          tal:condition="view/error_message"
-         tal:content="view/error_message">
+         tal:content="structure view/error_message/escapedtext">
         Error message.
       </p>
       <form id="search-all-bugs" class="central" action="/bugs/+bugs" method="get">
diff --git a/lib/lp/services/scripts/base.py b/lib/lp/services/scripts/base.py
index 36d34b0..59afada 100644
--- a/lib/lp/services/scripts/base.py
+++ b/lib/lp/services/scripts/base.py
@@ -19,6 +19,7 @@ from configparser import ConfigParser
 from contextlib import contextmanager
 from cProfile import Profile
 from optparse import OptionParser
+from typing import Optional
 from urllib.parse import urlparse, urlunparse
 
 import pytz
@@ -137,8 +138,8 @@ class LaunchpadScript:
 
     lock = None
     txn = None
-    usage = ""
-    description = ""
+    usage = None  # type: Optional[str]
+    description = None  # type: Optional[str]
     lockfilepath = None
     loglevel = logging.INFO
 
diff --git a/lib/lp/translations/browser/potemplate.py b/lib/lp/translations/browser/potemplate.py
index fe4fb89..505672a 100644
--- a/lib/lp/translations/browser/potemplate.py
+++ b/lib/lp/translations/browser/potemplate.py
@@ -603,10 +603,10 @@ class POTemplateEditView(ReturnToReferrerMixin, LaunchpadEditFormView):
         if referrer is None:
             # "referer" is misspelled in the HTTP specification.
             referrer = self.request.getHeader("referer")
-            # If we were looking at the actual template, we want a new
-            # URL constructed.
-            if referrer is not None and "/+pots/" in referrer:
-                returnChanged = True
+        # If we were looking at the actual template, we want a new URL
+        # constructed.
+        if referrer is not None and "/+pots/" in referrer:
+            returnChanged = True
 
         if (
             referrer is not None
@@ -758,11 +758,6 @@ class POTemplateEditView(ReturnToReferrerMixin, LaunchpadEditFormView):
                     "translation_domain", "Domain is already in use."
                 )
 
-    @property
-    def _return_attribute_name(self):
-        """See 'ReturnToReferrerMixin'."""
-        return "name"
-
 
 class POTemplateAdminView(POTemplateEditView):
     """View class that lets you admin a POTemplate object."""