general: don't put _ in __builtin__ (#15245)

tests/test_widgets.py

@@ -11,9 +11,6 @@ from wcs import publisher
 from wcs.qommon.form import *
 from wcs.qommon.http_request import HTTPRequest
 
-import __builtin__
-__builtin__.__dict__['ngettext'] = lambda x, y, z: x
-
 from utilities import create_temporary_pub
 
 def setup_module(module):

wcs/admin/bounces.py

@@ -21,6 +21,7 @@ from quixote import get_response, redirect
 from quixote.directory import Directory
 from quixote.html import htmltext, TemplateIO
 
+from qommon import _
 from qommon import errors
 from qommon import misc
 from qommon.bounces import Bounce

wcs/admin/categories.py

@@ -18,6 +18,7 @@ from quixote import redirect
 from quixote.directory import Directory
 from quixote.html import TemplateIO, htmltext
 
+from qommon import _
 from wcs.categories import Category
 from qommon.form import *
 from qommon.backoffice.menu import html_top

wcs/admin/data_sources.py

@@ -18,6 +18,7 @@ from quixote import redirect
 from quixote.directory import Directory
 from quixote.html import TemplateIO, htmltext
 
+from qommon import _
 from qommon.form import *
 from qommon.backoffice.menu import html_top
 from wcs.data_sources import (NamedDataSource, DataSourceSelectionWidget,

wcs/admin/fields.py

@@ -20,6 +20,7 @@ from quixote import redirect
 from quixote.directory import Directory
 from quixote.html import TemplateIO, htmltext
 
+from qommon import _
 from qommon.form import *
 from qommon import errors, misc
 from qommon.backoffice.menu import html_top

wcs/admin/forms.py

@@ -26,6 +26,7 @@ from quixote import get_response, redirect
 from quixote.directory import Directory, AccessControlled
 from quixote.html import TemplateIO, htmltext
 
+from qommon import _
 from qommon import misc
 from qommon.errors import *
 from qommon.form import *

wcs/admin/roles.py

@@ -18,6 +18,7 @@ from quixote import redirect
 from quixote.directory import Directory
 from quixote.html import TemplateIO, htmltext
 
+from qommon import _
 from qommon import errors
 from qommon.form import *
 

wcs/admin/settings.py

@@ -33,6 +33,7 @@ from quixote import get_publisher, get_request, get_response, redirect
 from quixote.directory import Directory
 from quixote.html import TemplateIO, htmltext
 
+from qommon import _
 from qommon import get_cfg
 from qommon import errors
 from qommon.form import *

wcs/admin/users.py

@@ -18,6 +18,7 @@ from quixote import get_publisher, get_response, get_request, get_session, redir
 from quixote.directory import Directory
 from quixote.html import TemplateIO, htmltext
 
+from qommon import _
 import wcs.qommon.storage as st
 from qommon import errors
 from qommon import misc, get_cfg

wcs/admin/workflows.py

@@ -27,6 +27,7 @@ from quixote import redirect, get_publisher
 from quixote.directory import Directory
 from quixote.html import TemplateIO, htmltext
 
+from qommon import _
 from qommon import errors
 from qommon import misc
 from qommon.form import *

wcs/admin/wscalls.py

@@ -18,6 +18,7 @@ from quixote import redirect
 from quixote.directory import Directory
 from quixote.html import TemplateIO, htmltext
 
+from qommon import _
 from qommon import errors
 from qommon.form import *
 from qommon.backoffice.menu import html_top

wcs/api.py

@@ -22,6 +22,8 @@ import sys
 
 from quixote import get_request, get_publisher, get_response
 from quixote.directory import Directory
+
+from qommon import _
 from qommon import misc
 from qommon.errors import (AccessForbiddenError, QueryError, TraversalError,
     UnknownNameIdAccessForbiddenError)

wcs/backoffice/management.py

@@ -30,6 +30,7 @@ from quixote import get_session, get_publisher, get_request, get_response, redir
 from quixote.directory import Directory
 from quixote.html import TemplateIO, htmltext
 
+from qommon import _, ngettext
 from qommon.admin.emails import EmailsDirectory
 from qommon.admin.menu import command_icon
 from qommon.backoffice.menu import html_top

wcs/backoffice/root.py

@@ -17,6 +17,7 @@
 from quixote import get_publisher, get_request, get_response, redirect
 from quixote.html import TemplateIO, htmltext
 
+from qommon import _
 from qommon.backoffice import BackofficeRootDirectory
 from qommon.backoffice.menu import html_top
 

wcs/backoffice/submission.py

@@ -18,6 +18,7 @@ from quixote import get_publisher, get_request, get_response, get_session, redir
 from quixote.directory import Directory
 from quixote.html import TemplateIO, htmltext
 
+from qommon import _
 from qommon.backoffice.menu import html_top
 from qommon.form import *
 from qommon import errors, misc

wcs/categories.py

@@ -17,6 +17,7 @@
 from quixote import get_publisher, get_response
 from quixote.html import htmltext
 
+from qommon import _
 from qommon.storage import StorableObject
 from qommon.misc import simplify
 from qommon.substitution import Substitutions

wcs/data_sources.py

@@ -22,6 +22,8 @@ import xml.etree.ElementTree as ET
 
 from quixote import get_publisher
 from quixote.html import TemplateIO
+
+from qommon import _
 from qommon.form import *
 from qommon.misc import get_variadic_url
 import qommon.misc

wcs/fields.py

@@ -27,6 +27,7 @@ from HTMLParser import HTMLParser
 from quixote import get_request, get_publisher
 from quixote.html import htmltext, TemplateIO
 
+from qommon import _
 from qommon.form import *
 from qommon.misc import localstrftime, date_format, ellipsize
 from qommon import get_cfg, get_logger

wcs/file_validation.py

@@ -20,6 +20,7 @@ import hashlib
 import urllib
 import base64
 
+from qommon import _
 from qommon import get_logger
 from qommon.misc import http_get_page, json_loads, http_post_request, ConnectionError
 import qommon.form

wcs/formdata.py

@@ -26,6 +26,7 @@ import time
 from quixote import get_request, get_publisher, get_session
 from quixote.http_request import Upload
 
+from qommon import _
 from qommon.storage import StorableObject, Intersects, Contains
 import qommon.misc
 from qommon import ezt

wcs/formdef.py

@@ -20,9 +20,10 @@ import json
 import xml.etree.ElementTree as ET
 import datetime
 
-from qommon.storage import StorableObject
 from quixote import get_request, get_publisher
 
+from qommon import _
+from qommon.storage import StorableObject
 from qommon.cron import CronJob
 from qommon.form import *
 from qommon.misc import simplify, get_as_datetime

wcs/forms/backoffice.py

@@ -19,6 +19,8 @@ import urllib
 from quixote import get_request, get_publisher, redirect
 from quixote.html import htmltext, TemplateIO
 
+from qommon import _
+from qommon.storage import StorableObject
 from qommon import misc
 from qommon.form import *
 from qommon.backoffice.listing import pagination_links

wcs/forms/common.py

@@ -26,6 +26,8 @@ from wcs.fields import WidgetField, FileField
 from wcs import file_validation
 from wcs.workflows import EditableWorkflowStatusItem
 
+from qommon import _
+from qommon.storage import StorableObject
 from qommon import template
 from qommon import get_logger
 from qommon.form import *

wcs/forms/root.py

@@ -36,6 +36,8 @@ from quixote.util import randbytes
 from quixote.form.widget import *
 from quixote.html import TemplateIO, htmltext
 
+from qommon import _
+from qommon.storage import StorableObject
 from qommon.admin.emails import EmailsDirectory
 from qommon import errors, get_cfg
 from qommon import misc, get_logger

wcs/qommon/__init__.py

@@ -15,13 +15,26 @@
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 from quixote import get_publisher
-from publisher import get_cfg, get_logger
 
 try:
     import lasso
 except ImportError:
     lasso = None
 
+def _(message):
+    pub = get_publisher()
+    if pub is None:
+        return message
+    return unicode(pub.gettext(str(message)), 'utf-8').encode(pub.site_charset)
+
+def ngettext(*args):
+    pub = get_publisher()
+    if pub is None:
+        return message
+    return unicode(pub.ngettext(*args), 'utf-8').encode(pub.site_charset)
+
+from publisher import get_cfg, get_logger
+
 if lasso:
     if not hasattr(lasso, 'SAML2_SUPPORT'):
         lasso.SAML2_SUPPORT = False

wcs/qommon/admin/emails.py

@@ -18,6 +18,7 @@ from quixote import redirect
 from quixote.directory import Directory
 from quixote.html import htmltext, TemplateIO
 
+from qommon import _
 from qommon.form import *
 from qommon import misc, get_cfg
 from qommon.backoffice.menu import html_top

wcs/qommon/admin/logger.py

@@ -21,6 +21,7 @@ from quixote import get_publisher, get_request, get_response
 from quixote.html import htmltext, TemplateIO
 from quixote.directory import Directory
 
+from qommon import _
 from qommon import get_cfg, logger, errors
 from qommon.backoffice.menu import html_top
 from qommon.admin.menu import error_page

wcs/qommon/admin/menu.py

@@ -17,6 +17,7 @@
 from quixote import get_publisher, get_request
 from quixote.html import TemplateIO, htmltext
 
+from qommon import _
 from qommon.backoffice.menu import html_top
 import re
 

wcs/qommon/admin/settings.py

@@ -18,6 +18,7 @@ from quixote import redirect
 from quixote.directory import Directory, AccessControlled
 from quixote.html import TemplateIO, htmltext
 
+from qommon import _
 from qommon.form import *
 from qommon.admin.cfg import cfg_submit
 from qommon.backoffice.menu import html_top

wcs/qommon/admin/texts.py

@@ -21,6 +21,7 @@ from quixote import redirect, get_publisher
 from quixote.html import TemplateIO, htmltext
 from quixote.directory import Directory
 
+from qommon import _
 from qommon.form import *
 from qommon import misc, get_cfg, ezt
 from qommon.backoffice.menu import html_top

wcs/qommon/afterjobs.py

@@ -19,7 +19,7 @@ from quixote import get_response
 
 import errors
 from http_response import AfterJob
-
+from qommon import _
 
 class AfterJobStatusDirectory(Directory):
     def _q_lookup(self, component):

wcs/qommon/backoffice/listing.py

@@ -19,6 +19,8 @@ import urllib
 from quixote.html import htmltext, TemplateIO
 from quixote import get_request, get_response
 
+from qommon import _
+
 def pagination_links(offset, limit, total_count):
     get_response().add_javascript(['jquery.js', 'wcs.listing.js'])
     # pagination

wcs/qommon/backoffice/menu.py

@@ -15,9 +15,10 @@
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 from quixote import get_response, get_request, get_publisher, get_session
+from quixote.html import htmltext, TemplateIO
 
 from qommon import get_cfg
-from quixote.html import htmltext, TemplateIO
+from qommon import _
 
 def generate_header_menu(selected = None):
     return get_publisher().get_backoffice_root().generate_header_menu(selected=selected)

wcs/qommon/backoffice/root.py

@@ -17,6 +17,7 @@
 from quixote.directory import Directory, AccessControlled
 from quixote import get_publisher, get_request, get_response
 
+from qommon import _
 from qommon import errors
 
 class BackofficeRootDirectory(AccessControlled, Directory):

wcs/qommon/ctl.py

@@ -25,6 +25,7 @@ __all__ = [
     ]
 
 import qommon
+from qommon import _
 qommon._commands = {}
 
 class Command(object):

wcs/qommon/errors.py

@@ -21,6 +21,7 @@ import quixote
 from quixote.errors import *
 from quixote.html import TemplateIO, htmltext
 
+from qommon import _
 import template
 
 

wcs/qommon/form.py

@@ -61,6 +61,7 @@ from quixote.form import *
 from quixote.html import htmltext, htmltag, htmlescape, TemplateIO
 from quixote.util import randbytes
 
+from qommon import _, ngettext
 import misc
 from strftime import strftime
 from publisher import get_cfg

wcs/qommon/humantime.py

@@ -16,6 +16,8 @@
 
 import re
 
+from qommon import _
+
 _minute = 60
 _hour = 60 * 60
 _day = _hour * 24

wcs/qommon/ident/idp.py

@@ -27,6 +27,7 @@ from quixote.directory import Directory
 from quixote import redirect, get_session, get_response, get_publisher
 from quixote.html import htmltext, TemplateIO
 
+from qommon import _
 from qommon import misc, get_cfg, get_logger
 from qommon.form import *
 from qommon.tokens import Token

wcs/qommon/ident/password.py

@@ -24,6 +24,7 @@ from quixote import redirect, get_publisher
 from quixote.directory import AccessControlled, Directory
 from quixote.html import TemplateIO, htmltext
 
+from qommon import _, ngettext
 from qommon.form import *
 
 from qommon.publisher import get_publisher_class

wcs/qommon/misc.py

@@ -34,6 +34,7 @@ import hashlib
 from quixote import get_publisher, get_response, get_request
 from quixote.html import htmltext
 
+from qommon import _
 from qommon import get_cfg, get_logger, ezt
 from qommon.errors import ConnectionError
 

wcs/qommon/myspace.py

@@ -18,6 +18,7 @@ from quixote import get_publisher, get_request, redirect, get_response, get_sess
 from quixote.directory import Directory
 from quixote.html import htmltext, TemplateIO
 
+from qommon import _
 from qommon import template
 from qommon.form import *
 from qommon import get_cfg

wcs/qommon/publisher.py

@@ -29,7 +29,6 @@ import sys
 import time
 import traceback
 import __builtin__
-__builtin__.__dict__['_'] = lambda x: x
 __builtin__.__dict__['N_'] = lambda x: x
 
 import gettext
@@ -58,6 +57,8 @@ import storage
 import strftime
 import urllib
 
+from qommon import _
+
 class ImmediateRedirectException(Exception):
     def __init__(self, location):
         self.location = location
@@ -94,6 +95,9 @@ class QommonPublisher(Publisher, object):
     app_translations = dict()
     statsd = None
 
+    gettext = lambda self, message: message
+    ngettext = lambda self, msgid1, msgid2, n: msgid1
+
     def get_root_url(self):
         if self.get_request():
             return self.get_request().environ['SCRIPT_NAME'] + '/'
@@ -389,14 +393,12 @@ class QommonPublisher(Publisher, object):
                 return trans
         return self.translations[lang]
 
-    def install_lang(self, lang = None):
+    def install_lang(self, lang=None):
         if lang is None or not self.translations.has_key(lang):
-            gettext.install(self.APP_NAME, names=('ngettext',)) # will use environment variable to get language
-        else:
-            self.get_translation(lang).install(names=('ngettext',))
-        _1 = _
-        __builtin__.__dict__['_'] = lambda x: unicode(_1(str(x)), 'utf-8').encode(self.site_charset)
-        __builtin__.__dict__['_1'] = _1
+            lang = (os.environ.get('LANG') or 'en')[:2]
+        translation = self.translations[lang]
+        self.gettext = translation.gettext
+        self.ngettext = translation.ngettext
 
     def load_site_options(self):
         self.site_options = ConfigParser.ConfigParser()
@@ -814,6 +816,7 @@ class QommonPublisher(Publisher, object):
     @classmethod
     def load_translations(cls):
         cls.translations = {
+            'C': gettext.NullTranslations(),
             'en': gettext.NullTranslations(),
         }
 

wcs/qommon/saml2.py

@@ -33,6 +33,7 @@ from quixote import get_session, get_session_manager
 
 import misc
 from publisher import get_cfg, get_logger
+from qommon import _
 from qommon import template
 from template import error_page
 from wcs.roles import Role

wcs/qommon/substitution.py

@@ -15,6 +15,7 @@
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 from quixote.html import htmltext, TemplateIO
+from qommon import _
 
 class Substitutions(object):
     substitutions_dict = {}

wcs/qommon/template.py

@@ -25,6 +25,7 @@ from quixote.directory import Directory
 from quixote.util import StaticDirectory, StaticFile
 from quixote.html import htmltext, htmlescape, TemplateIO
 
+from qommon import _
 import errors
 import ezt
 

wcs/roles.py

@@ -16,6 +16,7 @@
 
 from quixote import get_publisher
 
+from qommon import _
 from qommon.storage import StorableObject
 import qommon.misc
 

wcs/root.py

@@ -37,6 +37,7 @@ from quixote.util import StaticDirectory
 import forms.root
 from qommon import saml2
 
+from qommon import _
 from qommon import errors
 from qommon import get_cfg, get_logger
 from qommon import template

wcs/users.py

@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
+from qommon import _
 from qommon.storage import StorableObject
 from qommon import get_cfg
 import wcs.qommon.storage as st

wcs/wf/aggregation_email.py

@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
+from qommon import _
 from qommon.publisher import get_publisher_class
 from qommon.storage import StorableObject
 from qommon.form import *

wcs/wf/attachment.py

@@ -17,6 +17,7 @@
 
 from quixote import redirect
 
+from qommon import _
 from wcs.workflows import *
 from qommon.errors import *
 

wcs/wf/backoffice_fields.py

@@ -20,6 +20,7 @@ import xml.etree.ElementTree as ET
 
 from quixote import get_publisher
 
+from qommon import _
 from qommon import get_logger
 from qommon.form import (WidgetListAsTable, CompositeWidget, SingleSelectWidget,
         ComputedExpressionWidget, PicklableUpload)

wcs/wf/criticality.py

@@ -16,6 +16,7 @@
 
 from quixote import get_publisher
 
+from qommon import _
 from wcs.qommon.form import SingleSelectWidget
 from wcs.workflows import WorkflowStatusItem, register_item_class
 

wcs/wf/dispatch.py

@@ -17,6 +17,7 @@
 import collections
 import xml.etree.ElementTree as ET
 
+from qommon import _
 from qommon.form import *
 from qommon import get_logger
 from wcs.roles import Role, get_user_roles

wcs/wf/export_to_model.py

@@ -27,6 +27,8 @@ import shutil
 from quixote import get_response, get_request, get_publisher
 from quixote.directory import Directory
 from quixote.html import htmltext
+
+from qommon import _
 from qommon import get_logger
 from qommon import ezt, ods
 from qommon.form import (SingleSelectWidget, WidgetList, CheckboxWidget,

wcs/wf/form.py

@@ -16,6 +16,7 @@
 
 import xml.etree.ElementTree as ET
 
+from qommon import _
 from qommon.form import *
 
 from wcs.workflows import WorkflowStatusItem, register_item_class

wcs/wf/geolocate.py

@@ -26,6 +26,7 @@ except ImportError:
 
 from quixote import get_publisher
 
+from qommon import _
 from qommon import get_logger
 from qommon.form import RadiobuttonsWidget, ComputedExpressionWidget, CheckboxWidget
 from qommon.misc import http_get_page

wcs/wf/jump.py

@@ -21,6 +21,7 @@ import sys
 from quixote import get_publisher, get_request, redirect
 
 from quixote.directory import Directory
+from qommon import _
 from qommon.humantime import *
 from qommon.form import *
 from qommon import errors

wcs/wf/profile.py

@@ -20,6 +20,7 @@ import xml.etree.ElementTree as ET
 
 from quixote import get_publisher, get_response
 
+from qommon import _
 from qommon.form import (CompositeWidget, SingleSelectWidget,
         WidgetListAsTable, ComputedExpressionWidget)
 from qommon.ident.idp import is_idp_managing_user_attributes

wcs/wf/redirect_to_url.py

@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
+from qommon import _
 from qommon.form import ComputedExpressionWidget
 from wcs.workflows import WorkflowStatusItem, register_item_class
 

wcs/wf/register_comment.py

@@ -16,6 +16,7 @@
 
 import cgi
 
+from qommon import _
 from qommon.form import *
 from qommon import ezt
 from qommon import get_logger

wcs/wf/remove.py

@@ -15,6 +15,7 @@
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 from quixote import get_publisher, get_request, get_response, get_session
+from qommon import _
 from wcs.workflows import WorkflowStatusItem, register_item_class
 
 class RemoveWorkflowStatusItem(WorkflowStatusItem):

wcs/wf/resubmit.py

@@ -16,6 +16,7 @@
 
 from quixote import get_publisher
 
+from qommon import _
 from wcs.workflows import WorkflowStatusItem, register_item_class
 from wcs.formdef import FormDef
 from wcs.qommon.form import (WidgetList, SingleSelectWidget, StringWidget,

wcs/wf/roles.py

@@ -19,6 +19,8 @@ import urllib
 import sys
 
 from quixote import get_request, get_publisher, get_response
+
+from qommon import _
 from qommon.form import *
 from wcs.workflows import WorkflowStatusItem, register_item_class
 from wcs.roles import get_user_roles, Role

wcs/wf/wscall.py

@@ -23,8 +23,9 @@ import collections
 import mimetypes
 from StringIO import StringIO
 
-
 from quixote.html import TemplateIO, htmltext
+
+from qommon import _
 from qommon.errors import ConnectionError
 from qommon.form import *
 from qommon.misc import json_loads, site_encode

wcs/workflows.py

@@ -30,6 +30,7 @@ import hashlib
 
 from quixote import get_request, redirect
 
+from qommon import _
 from qommon.misc import C_, get_as_datetime, file_digest
 from qommon.storage import StorableObject, atomic_write
 from qommon.form import *

wcs/wscalls.py

@@ -23,6 +23,7 @@ import xml.etree.ElementTree as ET
 
 from quixote import get_publisher
 
+from qommon import _
 from qommon.misc import (simplify, http_get_page, http_post_request,
         get_variadic_url, JSONEncoder, json_loads)
 from qommon.xml_storage import XmlStorableObject