remove deprecated borrow and read pages (#11836)

Author: RayBB

openlibrary/i18n/messages.pot

@@ -5945,11 +5945,11 @@ msgstr ""
 #: home/loans.html
 #, python-format
 msgid ""
-"You can still <a href=\"/borrow\">borrow</a> one more book until you've "
-"hit the limit!"
+"You can still <a href=\"/subjects/in_library#ebooks=true\">borrow</a> one"
+" more book until you've hit the limit!"
 msgid_plural ""
-"You can still <a href=\"/borrow\">borrow</a> %(count)d more books until "
-"you've hit the limit!"
+"You can still <a href=\"/subjects/in_library#ebooks=true\">borrow</a> "
+"%(count)d more books until you've hit the limit!"
 msgstr[0] ""
 msgstr[1] ""
 

openlibrary/plugins/openlibrary/borrow_home.py

@@ -1,51 +1,15 @@
 """
-Controllers for /borrow pages.
-
-These endpoints are largely deprecated, and only maintained for
-backwards compatibility.
+Event handlers for loan statistics.
 """
 
 import datetime
 import json
 
 import eventer
-import web
 
-from infogami.utils import delegate
-from infogami.utils.view import render_template  # noqa: F401 used for its side effects
 from openlibrary.core import statsdb
 
 
-class borrow(delegate.page):
-    path = "/borrow"
-
-    def GET(self):
-        raise web.seeother('/subjects/in_library#ebooks=true')
-
-
-class borrow_json(delegate.page):
-    path = "/borrow"
-    encoding = "json"
-
-    def GET(self):
-        raise web.seeother('/subjects/in_library.json' + web.ctx.query)
-
-
-class read(delegate.page):
-    path = "/read"
-
-    def GET(self):
-        web.seeother('/subjects/accessible_book#ebooks=true')
-
-
-class read_json(delegate.page):
-    path = "/read"
-    encoding = "json"
-
-    def GET(self):
-        web.seeother('/subjects/accessible_book.json' + web.ctx.query)
-
-
 def on_loan_created_statsdb(loan):
     """Adds the loan info to the stats database."""
     key = _get_loan_key(loan)

openlibrary/templates/home/loans.html

@@ -8,7 +8,7 @@ <h2 class="home-h2"><a href="/account/loans">$_("My Books")</a></h2>
           &nbsp;
           $if len(loans):
               $ loans_remaining = 5 - len(loans)
-              $:ungettext('You can still <a href="/borrow">borrow</a> one more book until you\'ve hit the limit!', 'You can still <a href="/borrow">borrow</a> %(count)d more books until you\'ve hit the limit!', loans_remaining, count=loans_remaining)
+              $:ungettext('You can still <a href="/subjects/in_library#ebooks=true">borrow</a> one more book until you\'ve hit the limit!', 'You can still <a href="/subjects/in_library#ebooks=true">borrow</a> %(count)d more books until you\'ve hit the limit!', loans_remaining, count=loans_remaining)
           $else:
               $_("You have reached the borrowing limit. Please return a book to checkout something new.")
         </p>

openlibrary/templates/home/stats.html

@@ -37,7 +37,7 @@ <h2 class="inline">$_('Around the Library')</h2>
         <div class="statschart">
           <div class="chartShow" onclick="window.location.href='/stats';" title="$_('We\'re a library, so we lend books, too')">
             <div id="ebooks-graph" style="width:150px;height:60px;" title="$_('Area graph of ebooks borrowed recently')"></div>
-            <a href="/borrow" title="$_('We\'re a library, so we lend books, too')"><span class="ticks">$:commify(stats["loans"].get_summary(28))</span><span class="label">$_('eBooks Borrowed')</span></a>
+            <a href="/subjects/in_library#ebooks=true" title="$_('We\'re a library, so we lend books, too')"><span class="ticks">$:commify(stats["loans"].get_summary(28))</span><span class="label">$_('eBooks Borrowed')</span></a>
           </div>
         </div>
       </div>