Merge ~cjwatson/launchpad:remove-dbschemaapi into launchpad:master

[Colin Watson]

Remove deprecated DBSchemaAPI TALES adapter

This was deprecated long ago and is no longer used (difficult to search for, but confirmed by a full test run).

[Colin Watson (cjwatson)]

This is a relatively straightforward code cleanup and doesn't need much review. I'm landing this so that I have a commit to use to let me deploy an unrelated config change easily.

The CI failure will be fixed by https://code.launchpad.net/~cjwatson/launchpad-buildd/+git/launchpad-buildd/+merge/436371.

review: Approve

diff --git a/lib/lp/app/browser/configure.zcml b/lib/lp/app/browser/configure.zcml
index cc40021..8d8ff75 100644
--- a/lib/lp/app/browser/configure.zcml
+++ b/lib/lp/app/browser/configure.zcml
@@ -648,13 +648,6 @@
       />
 
   <adapter
-      for="int"
-      provides="zope.traversing.interfaces.IPathAdapter"
-      factory="lp.app.browser.tales.DBSchemaAPI"
-      name="lp"
-      />
-
-  <adapter
       for="datetime.datetime"
       provides="zope.traversing.interfaces.IPathAdapter"
       factory="lp.app.browser.tales.DateTimeFormatterAPI"
diff --git a/lib/lp/app/browser/tales.py b/lib/lp/app/browser/tales.py
index 89a29bc..ed832e8 100644
--- a/lib/lp/app/browser/tales.py
+++ b/lib/lp/app/browser/tales.py
@@ -13,7 +13,6 @@ from textwrap import dedent
 from urllib.parse import quote
 
 import pytz
-from lazr.enum import enumerated_type_registry
 from lazr.restful.utils import get_current_browser_request
 from lazr.uri import URI
 from zope.browserpage import ViewPageTemplateFile
@@ -448,23 +447,6 @@ class RequestAPI:
         return params
 
 
-@implementer(ITraversable)
-class DBSchemaAPI:
-    """Adapter from integers to things that can extract information from
-    DBSchemas.
-    """
-
-    def __init__(self, number):
-        self._number = number
-
-    def traverse(self, name, furtherPath):
-        if name in enumerated_type_registry:
-            enum = enumerated_type_registry[name]
-            return enum.items[self._number].title
-        else:
-            raise TraversalError(name)
-
-
 # Python 3 doesn't have types.NoneType, but we still need to be able to
 # refer to the type of None from ZCML so that we can register the
 # NoneFormatter adapter.
diff --git a/lib/lp/app/doc/tales.rst b/lib/lp/app/doc/tales.rst
index eb27ee5..162b579 100644
--- a/lib/lp/app/doc/tales.rst
+++ b/lib/lp/app/doc/tales.rst
@@ -1569,21 +1569,6 @@ with 'None/fmt:foo'.
     ''
 
 
-The lp: namespace for presenting DBSchema items
------------------------------------------------
-
-This is deprecated, and should raise a deprecation warning in the
-future, and eventually be removed.  It is no longer needed, now that we
-have an EnumCol for sqlobject.
-
-Test the 'lp:' namespace for presenting DBSchema items.
-
-    >>> from lp.soyuz.enums import BinaryPackageFormat
-    >>> deb = BinaryPackageFormat.DEB.value
-    >>> test_tales("deb/lp:BinaryPackageFormat", deb=deb)
-    'Ubuntu Package'
-
-
 The someobject/required:some.Permission helper
 ----------------------------------------------
 
@@ -1615,6 +1600,7 @@ template matches a particular valid value for that DBSchema enum.
 This was going to be called 'enum-value', but Zope doesn't allow this.
 To be fixed upstream.
 
+    >>> from lp.soyuz.enums import BinaryPackageFormat
     >>> deb = BinaryPackageFormat.DEB
     >>> udeb = BinaryPackageFormat.UDEB
     >>> test_tales("deb/enumvalue:DEB", deb=deb)
diff --git a/lib/lp/app/tests/test_tales.py b/lib/lp/app/tests/test_tales.py
index 2520a12..0230f4f 100644
--- a/lib/lp/app/tests/test_tales.py
+++ b/lib/lp/app/tests/test_tales.py
@@ -100,36 +100,6 @@ def test_cookie_scope():
     """
 
 
-def test_dbschemaapi():
-    """
-    >>> from lp.app.browser.tales import DBSchemaAPI
-    >>> from lp.code.enums import BranchType
-
-    The syntax to get the title is: number/lp:DBSchemaClass
-
-    >>> (
-    ...     str(DBSchemaAPI(1).traverse("BranchType", []))
-    ...     == BranchType.HOSTED.title
-    ... )
-    True
-
-    Using an inappropriate number should give a KeyError.
-
-    >>> DBSchemaAPI(99).traverse("BranchType", [])
-    Traceback (most recent call last):
-    ...
-    KeyError: 99
-
-    Using a dbschema name that doesn't exist should give a LocationError
-
-    >>> DBSchemaAPI(99).traverse("NotADBSchema", [])
-    Traceback (most recent call last):
-    ...
-    LocationError: 'NotADBSchema'
-
-    """
-
-
 class TestPersonFormatterAPI(TestCaseWithFactory):
     """Tests for PersonFormatterAPI"""