From 2fe006388defdc891e6836d106b992d286cb96bd Mon Sep 17 00:00:00 2001
From: eric <eric@hellman.net>
Date: Fri, 26 Jul 2019 11:54:24 -0400
Subject: [PATCH] stop using buitins as global

---
 BaseSearcher.py        | 3 +++
 BibrecPage.py          | 2 ++
 CherryPyApp.py         | 8 --------
 CloudStorage.py        | 1 +
 DublinCoreI18n.py      | 2 +-
 Formatters.py          | 1 +
 HTMLFormatter.py       | 1 +
 Page.py                | 1 +
 SearchPage.py          | 2 ++
 StartPage.py           | 1 +
 templates/results.opds | 2 +-
 11 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/BaseSearcher.py b/BaseSearcher.py
index 312f4c2..8bc6f99 100644
--- a/BaseSearcher.py
+++ b/BaseSearcher.py
@@ -33,6 +33,9 @@ from libgutenberg import DublinCore
 from libgutenberg import GutenbergDatabaseDublinCore
 from libgutenberg import GutenbergGlobals as gg
 
+from i18n_tool import ugettext as _
+from i18n_tool import ungettext as __
+
 import DublinCoreI18n
 from SupportedLocales import FB_LANGS, TWITTER_LANGS, GOOGLE_LANGS, PAYPAL_LANGS, FLATTR_LANGS
 
diff --git a/BibrecPage.py b/BibrecPage.py
index 6d0ede2..1ed1a47 100644
--- a/BibrecPage.py
+++ b/BibrecPage.py
@@ -17,6 +17,8 @@ from __future__ import unicode_literals
 import cherrypy
 
 from libgutenberg import GutenbergGlobals as gg
+from i18n_tool import ugettext as _
+from i18n_tool import ungettext as __
 
 import BaseSearcher
 import Page
diff --git a/CherryPyApp.py b/CherryPyApp.py
index 9ab743c..65eefbc 100644
--- a/CherryPyApp.py
+++ b/CherryPyApp.py
@@ -24,17 +24,9 @@ import traceback
 
 import cherrypy
 from cherrypy.process import plugins
-import six
-from six.moves import builtins
 
 from libgutenberg import GutenbergDatabase
 
-import i18n_tool
-# Make translator functions available everywhere. Do this early, at
-# least before Genshi starts loading templates.
-builtins._ = i18n_tool.ugettext
-builtins.__ = i18n_tool.ungettext
-
 # this import causes ConnectionPool.ConnectionPool to become the cherrypy connection pool
 import ConnectionPool
 
diff --git a/CloudStorage.py b/CloudStorage.py
index 4b3679b..0d0d1f2 100644
--- a/CloudStorage.py
+++ b/CloudStorage.py
@@ -28,6 +28,7 @@ import requests_oauthlib
 from requests import RequestException
 from oauthlib.oauth2.rfc6749.errors import OAuth2Error
 
+from i18n_tool import ugettext as _
 import BaseSearcher
 
 # pylint: disable=R0921
diff --git a/DublinCoreI18n.py b/DublinCoreI18n.py
index 6ac5a8c..1bb4999 100644
--- a/DublinCoreI18n.py
+++ b/DublinCoreI18n.py
@@ -17,7 +17,7 @@ from __future__ import unicode_literals
 
 import cherrypy
 import babel
-
+from i18n_tool import ugettext as _
 
 class DublinCoreI18nMixin (object):
     """ Translator Mixin for GutenbergDatabaseDublinCore class. """
diff --git a/Formatters.py b/Formatters.py
index 793d4c5..02cc4e6 100644
--- a/Formatters.py
+++ b/Formatters.py
@@ -23,6 +23,7 @@ import genshi.filters
 
 import cherrypy
 
+from i18n_tool import ugettext as _
 import HTMLFormatter
 import OPDSFormatter
 import JSONFormatter
diff --git a/HTMLFormatter.py b/HTMLFormatter.py
index 2730a7d..81bacef 100644
--- a/HTMLFormatter.py
+++ b/HTMLFormatter.py
@@ -26,6 +26,7 @@ from libgutenberg.MediaTypes import mediatypes as mt
 
 import BaseSearcher
 import BaseFormatter
+from i18n_tool import ugettext as _
 
 # filetypes ignored on desktop site
 NO_DESKTOP_FILETYPES = 'plucker qioo rdf rst rst.gen rst.master tei cover.medium cover.small'.split ()
diff --git a/Page.py b/Page.py
index ca6d5f3..ff8a24f 100644
--- a/Page.py
+++ b/Page.py
@@ -23,6 +23,7 @@ from libgutenberg.GutenbergDatabase import DatabaseError
 
 import BaseSearcher
 import Formatters
+from i18n_tool import ugettext as _
 
 class Page (object):
     """ Base for all pages. """
diff --git a/SearchPage.py b/SearchPage.py
index 000338d..7642d31 100644
--- a/SearchPage.py
+++ b/SearchPage.py
@@ -21,6 +21,8 @@ from libgutenberg.DublinCore import DublinCore
 
 import BaseSearcher
 from Page import SearchPage
+from i18n_tool import ugettext as _
+from i18n_tool import ungettext as __
 
 
 class BookSearchPage (SearchPage):
diff --git a/StartPage.py b/StartPage.py
index ab8dd9b..8ec4997 100644
--- a/StartPage.py
+++ b/StartPage.py
@@ -16,6 +16,7 @@ from __future__ import unicode_literals
 
 import BaseSearcher
 import Page
+from i18n_tool import ugettext as _
 
 class Start (Page.Page):
     """ The start page. """
diff --git a/templates/results.opds b/templates/results.opds
index 0e78c1b..8fcb2e0 100644
--- a/templates/results.opds
+++ b/templates/results.opds
@@ -14,7 +14,7 @@ which contains *all* Project Gutenberg metadata in one RDF/XML file.
 <?python
   import re
   from libgutenberg import GutenbergGlobals as gg
-
+  from i18n_tool import ugettext as _
   if os.format == 'stanza':
      os.type_opds = "application/atom+xml"
      opds_relations = {