genshi/genshi-test: genshi/filters/i18n.py comparison

comparison genshi/filters/i18n.py @ 916:872726bac135 experimental-py3k

add support for python 3 to genshi.filters: * minor changes to track encoding=None API change in core genshi modules. * renamed genshi/filters/tests/html.py to test_html.py to avoid clashes with Python 3 top-level html module when running tests subset. * did not rename genshi/filters/html.py. * i18n filters: * ugettext and friends are gone in Python 3 (and only gettext and friends exist and they now handle unicode) * Some \ line continuations inside doctests confused 2to3 and so were removed them. * Testing picked up a problem (already present in trunk) where Translator.__call__ could end up defining gettext as an endlessly recursive function. Noted with a TODO.

author	hodgestar
date	Sun, 24 Oct 2010 22:21:28 +0000
parents	85e4678337cf
children

comparison

equal deleted inserted replaced

-:9fafb35032a1
+:872726bac135
 XML_NAMESPACE, _ensure, StreamEventKind
 from genshi.template.eval import _ast
 from genshi.template.base import DirectiveFactory, EXPR, SUB, _apply_directives
 from genshi.template.directives import Directive, StripDirective
 from genshi.template.markup import MarkupTemplate, EXEC
+from genshi.compat import IS_PYTHON2
 __all__ = ['Translator', 'extract']
 __docformat__ = 'restructuredtext en'
 an integer which will allow to choose the plural/singular form. If you also
 have expressions inside the singular and plural version of the string you
 also need to pass a name for those parameters. Consider the following
 examples:
->>> tmpl = MarkupTemplate('''\
+>>> tmpl = MarkupTemplate('''<html xmlns:i18n="http://genshi.edgewall.org/i18n">
-<html xmlns:i18n="http://genshi.edgewall.org/i18n">
 ...   <div i18n:choose="num; num">
 ...     <p i18n:singular="">There is $num coin</p>
 ...     <p i18n:plural="">There are $num coins</p>
 ...   </div>
 ... </html>''')
 >>> translator.setup(tmpl)
 >>> list(translator.extract(tmpl.stream)) #doctest: +NORMALIZE_WHITESPACE
 [(2, 'ngettext', (u'There is %(num)s coin',
 u'There are %(num)s coins'), [])]
->>> tmpl = MarkupTemplate('''\
+>>> tmpl = MarkupTemplate('''<html xmlns:i18n="http://genshi.edgewall.org/i18n">
-<html xmlns:i18n="http://genshi.edgewall.org/i18n">
 ...   <div i18n:choose="num; num">
 ...     <p i18n:singular="">There is $num coin</p>
 ...     <p i18n:plural="">There are $num coins</p>
 ...   </div>
 ... </html>''')
 </div>
 </html>
 When used as a element and not as an attribute:
->>> tmpl = MarkupTemplate('''\
+>>> tmpl = MarkupTemplate('''<html xmlns:i18n="http://genshi.edgewall.org/i18n">
-<html xmlns:i18n="http://genshi.edgewall.org/i18n">
 ...   <i18n:choose numeral="num" params="num">
 ...     <p i18n:singular="">There is $num coin</p>
 ...     <p i18n:plural="">There are $num coins</p>
 ...   </i18n:choose>
 ... </html>''')
 class DomainDirective(I18NDirective):
 """Implementation of the ``i18n:domain`` directive which allows choosing
 another i18n domain(catalog) to translate from.
 >>> from genshi.filters.tests.i18n import DummyTranslations
->>> tmpl = MarkupTemplate('''\
+>>> tmpl = MarkupTemplate('''<html xmlns:i18n="http://genshi.edgewall.org/i18n">
-<html xmlns:i18n="http://genshi.edgewall.org/i18n">
 ...   <p i18n:msg="">Bar</p>
 ...   <div i18n:domain="foo">
 ...     <p i18n:msg="">FooBar</p>
 ...     <p>Bar</p>
 ...     <p i18n:domain="bar" i18n:msg="">Bar</p>
 if type(self.translate) is FunctionType:
 gettext = self.translate
 if ctxt:
 ctxt['_i18n.gettext'] = gettext
 else:
-gettext = self.translate.ugettext
+if IS_PYTHON2:
-ngettext = self.translate.ungettext
+gettext = self.translate.ugettext
+ngettext = self.translate.ungettext
+else:
+gettext = self.translate.gettext
+ngettext = self.translate.ngettext
 try:
-dgettext = self.translate.dugettext
+if IS_PYTHON2:
-dngettext = self.translate.dungettext
+dgettext = self.translate.dugettext
+dngettext = self.translate.dungettext
+else:
+dgettext = self.translate.dgettext
+dngettext = self.translate.dngettext
 except AttributeError:
 dgettext = lambda _, y: gettext(y)
 dngettext = lambda _, s, p, n: ngettext(s, p, n)
 if ctxt:
 ctxt['_i18n.gettext'] = gettext
 ctxt['_i18n.ngettext'] = ngettext
 ctxt['_i18n.dgettext'] = dgettext
 ctxt['_i18n.dngettext'] = dngettext
 if ctxt and ctxt.get('_i18n.domain'):
+# TODO: This can cause infinite recursion if dgettext is defined
+#       via the AttributeError case above!
 gettext = lambda msg: dgettext(ctxt.get('_i18n.domain'), msg)
 for kind, data, pos in stream:
 # skip chunks that should not be localized
 def _walk(node):
 if isinstance(node, _ast.Call) and isinstance(node.func, _ast.Name) \
 and node.func.id in gettext_functions:
 strings = []
 def _add(arg):
-if isinstance(arg, _ast.Str) and isinstance(arg.s, basestring):
+if isinstance(arg, _ast.Str) and isinstance(arg.s, unicode):
+strings.append(arg.s)
+elif isinstance(arg, _ast.Str):
 strings.append(unicode(arg.s, 'utf-8'))
 elif arg:
 strings.append(None)
 [_add(arg) for arg in node.args]
 _add(node.starargs)

Mercurial > genshi > genshi-test

comparison genshi/filters/i18n.py @ 916:872726bac135 experimental-py3k