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

comparison genshi/filters/tests/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
 # history and logs, available at http://genshi.edgewall.org/log/.
 from datetime import datetime
 import doctest
 from gettext import NullTranslations
-from StringIO import StringIO
 import unittest
 from genshi.core import Attrs
 from genshi.template import MarkupTemplate, Context
 from genshi.filters.i18n import Translator, extract
 from genshi.input import HTML
+from genshi.compat import IS_PYTHON2, StringIO
 class DummyTranslations(NullTranslations):
 _domains = {}
 self._domains[domain] = translation
 def _domain_call(self, func, domain, *args, **kwargs):
 return getattr(self._domains.get(domain, self), func)(*args, **kwargs)
-def ugettext(self, message):
+if IS_PYTHON2:
-missing = object()
+def ugettext(self, message):
-tmsg = self._catalog.get(message, missing)
+missing = object()
-if tmsg is missing:
+tmsg = self._catalog.get(message, missing)
-if self._fallback:
+if tmsg is missing:
-return self._fallback.ugettext(message)
+if self._fallback:
-return unicode(message)
+return self._fallback.ugettext(message)
-return tmsg
+return unicode(message)
+return tmsg
-def dugettext(self, domain, message):
+else:
-return self._domain_call('ugettext', domain, message)
+def gettext(self, message):
+missing = object()
+tmsg = self._catalog.get(message, missing)
+if tmsg is missing:
+if self._fallback:
+return self._fallback.gettext(message)
+return unicode(message)
+return tmsg
+if IS_PYTHON2:
+def dugettext(self, domain, message):
+return self._domain_call('ugettext', domain, message)
+else:
+def dgettext(self, domain, message):
+return self._domain_call('gettext', domain, message)
 def ungettext(self, msgid1, msgid2, n):
 try:
 return self._catalog[(msgid1, self.plural(n))]
 except KeyError:
 if n == 1:
 return msgid1
 else:
 return msgid2
-def dungettext(self, domain, singular, plural, numeral):
+if not IS_PYTHON2:
-return self._domain_call('ungettext', domain, singular, plural, numeral)
+ngettext = ungettext
+del ungettext
+if IS_PYTHON2:
+def dungettext(self, domain, singular, plural, numeral):
+return self._domain_call('ungettext', domain, singular, plural, numeral)
+else:
+def dngettext(self, domain, singular, plural, numeral):
+return self._domain_call('ngettext', domain, singular, plural, numeral)
 class TranslatorTestCase(unittest.TestCase):
 def test_translate_included_attribute_text(self):
 """
 Verify that translated attributes end up in a proper `Attrs` instance.
 """
-html = HTML("""<html>
+html = HTML(u"""<html>
 <span title="Foo"></span>
 </html>""")
 translator = Translator(lambda s: u"Voh")
 stream = list(html.filter(translator))
 kind, data, pos = stream[2]
 </p>
 </html>""")
 gettext = lambda s: u"Für Details siehe bitte [1:Hilfe]."
 translator = Translator(gettext)
 translator.setup(tmpl)
-self.assertEqual("""<html>
+self.assertEqual(u"""<html>
 <p>Für Details siehe bitte <a href="help.html">Hilfe</a>.</p>
-</html>""", tmpl.generate().render())
+</html>""".encode('utf-8'), tmpl.generate().render(encoding='utf-8'))
 def test_extract_i18n_msg_nonewline(self):
 tmpl = MarkupTemplate("""<html xmlns:py="http://genshi.edgewall.org/"
 xmlns:i18n="http://genshi.edgewall.org/i18n">
 <p i18n:msg="">Please see <a href="help.html">Help</a></p>
 <p i18n:msg="">Please see <a href="help.html">Help</a></p>
 </html>""")
 gettext = lambda s: u"Für Details siehe bitte [1:Hilfe]"
 translator = Translator(gettext)
 translator.setup(tmpl)
-self.assertEqual("""<html>
+self.assertEqual(u"""<html>
 <p>Für Details siehe bitte <a href="help.html">Hilfe</a></p>
 </html>""", tmpl.generate().render())
 def test_extract_i18n_msg_elt_nonewline(self):
 tmpl = MarkupTemplate("""<html xmlns:py="http://genshi.edgewall.org/"
 <i18n:msg>Please see <a href="help.html">Help</a></i18n:msg>
 </html>""")
 gettext = lambda s: u"Für Details siehe bitte [1:Hilfe]"
 translator = Translator(gettext)
 translator.setup(tmpl)
-self.assertEqual("""<html>
+self.assertEqual(u"""<html>
 Für Details siehe bitte <a href="help.html">Hilfe</a>
-</html>""", tmpl.generate().render())
+</html>""".encode('utf-8'), tmpl.generate().render(encoding='utf-8'))
 def test_extract_i18n_msg_with_attributes(self):
 tmpl = MarkupTemplate("""<html xmlns:py="http://genshi.edgewall.org/"
 xmlns:i18n="http://genshi.edgewall.org/i18n">
 <p i18n:msg="" title="A helpful paragraph">
 </p>
 </html>""")
 gettext = lambda s: u"Für Details siehe bitte [1:[2:Hilfeseite]]."
 translator = Translator(gettext)
 translator.setup(tmpl)
-self.assertEqual("""<html>
+self.assertEqual(u"""<html>
 <p>Für Details siehe bitte <a href="help.html"><em>Hilfeseite</em></a>.</p>
 </html>""", tmpl.generate().render())
 def test_extract_i18n_msg_label_with_nested_input(self):
 tmpl = MarkupTemplate("""<html xmlns:py="http://genshi.edgewall.org/"
 </p>
 </html>""")
 gettext = lambda s: u"[1:] Einträge pro Seite anzeigen."
 translator = Translator(gettext)
 translator.setup(tmpl)
-self.assertEqual("""<html>
+self.assertEqual(u"""<html>
 <p><input type="text" name="num"/> Einträge pro Seite anzeigen.</p>
 </html>""", tmpl.generate().render())
 def test_extract_i18n_msg_multiple(self):
 tmpl = MarkupTemplate("""<html xmlns:py="http://genshi.edgewall.org/"
 </p>
 </html>""")
 gettext = lambda s: u"Für [2:Details] siehe bitte [1:Hilfe]."
 translator = Translator(gettext)
 translator.setup(tmpl)
-self.assertEqual("""<html>
+self.assertEqual(u"""<html>
 <p>Für <em>Details</em> siehe bitte <a href="help.html">Hilfe</a>.</p>
 </html>""", tmpl.generate().render())
 def test_extract_i18n_msg_multiple_empty(self):
 tmpl = MarkupTemplate("""<html xmlns:py="http://genshi.edgewall.org/"
 tmpl = MarkupTemplate("""<html xmlns:py="http://genshi.edgewall.org/"
 xmlns:i18n="http://genshi.edgewall.org/i18n">
 <p i18n:msg="">
 Show me <input type="text" name="num" /> entries per page, starting at page <input type="text" name="num" />.
 </p>
-</html>""")
+</html>""", encoding='utf-8')
 gettext = lambda s: u"[1:] Einträge pro Seite, beginnend auf Seite [2:]."
 translator = Translator(gettext)
 translator.setup(tmpl)
-self.assertEqual("""<html>
+self.assertEqual(u"""<html>
-<p><input type="text" name="num"/> Eintr\xc3\xa4ge pro Seite, beginnend auf Seite <input type="text" name="num"/>.</p>
+<p><input type="text" name="num"/> Eintr\u00E4ge pro Seite, beginnend auf Seite <input type="text" name="num"/>.</p>
-</html>""", tmpl.generate().render())
+</html>""".encode('utf-8'), tmpl.generate().render(encoding='utf-8'))
 def test_extract_i18n_msg_with_param(self):
 tmpl = MarkupTemplate("""<html xmlns:py="http://genshi.edgewall.org/"
 xmlns:i18n="http://genshi.edgewall.org/i18n">
 <p i18n:msg="name">
 </p>
 </html>""")
 gettext = lambda s: u"%(name)s, sei gegrüßt!"
 translator = Translator(gettext)
 translator.setup(tmpl)
-self.assertEqual("""<html>
+self.assertEqual(u"""<html>
 <p>Jim, sei gegrüßt!</p>
 </html>""", tmpl.generate(user=dict(name='Jim')).render())
 def test_translate_i18n_msg_with_attribute_param(self):
 tmpl = MarkupTemplate("""<html xmlns:py="http://genshi.edgewall.org/"
 </p>
 </html>""")
 gettext = lambda s: u"Sei gegrüßt, [1:Alter]!"
 translator = Translator(gettext)
 translator.setup(tmpl)
-self.assertEqual("""<html>
+self.assertEqual(u"""<html>
 <p>Sei gegrüßt, <a href="#42">Alter</a>!</p>
 </html>""", tmpl.generate(anchor='42').render())
 def test_extract_i18n_msg_with_two_params(self):
 tmpl = MarkupTemplate("""<html xmlns:py="http://genshi.edgewall.org/"
 </p>
 </html>""")
 gettext = lambda s: u"[1:] Einträge pro Seite anzeigen."
 translator = Translator(gettext)
 translator.setup(tmpl)
-self.assertEqual("""<html>
+self.assertEqual(u"""<html>
 <p><input type="text" name="num" value="x"/> Einträge pro Seite anzeigen.</p>
 </html>""", tmpl.generate().render())
 def test_extract_i18n_msg_with_comment(self):
 tmpl = MarkupTemplate("""<html xmlns:py="http://genshi.edgewall.org/"
 'Foo': 'Voh',
 'Foo bar': u'Voh bär'
 }))
 tmpl.filters.insert(0, translator)
 tmpl.add_directives(Translator.NAMESPACE, translator)
-self.assertEqual("""<html>
+self.assertEqual(u"""<html>
 <p title="Voh bär">Voh</p>
 </html>""", tmpl.generate().render())
 def test_translate_i18n_msg_and_py_strip_directives(self):
 tmpl = MarkupTemplate("""<html xmlns:py="http://genshi.edgewall.org/"
 translations = DummyTranslations({
 'Changed %(date)s ago by %(author)s': u'Modificado à %(date)s por %(author)s'
 })
 translator = Translator(translations)
 translator.setup(tmpl)
-self.assertEqual("""<html>
+self.assertEqual(u"""<html>
 Modificado à um dia por Pedro
-</html>""", tmpl.generate(date='um dia', author="Pedro").render())
+</html>""".encode('utf-8'), tmpl.generate(date='um dia', author="Pedro").render(encoding='utf-8'))
 def test_i18n_msg_ticket_251_extract(self):
 tmpl = MarkupTemplate("""<html xmlns:py="http://genshi.edgewall.org/"
 xmlns:i18n="http://genshi.edgewall.org/i18n">
 u'[1:[2:Translation\\[\xa00\xa0\\]]: [3:One coin]]':
 u'[1:[2:Trandução\\[\xa00\xa0\\]]: [3:Uma moeda]]'
 })
 translator = Translator(translations)
 translator.setup(tmpl)
-self.assertEqual("""<html>
+self.assertEqual(u"""<html>
 <p><tt><b>Trandução[ 0 ]</b>: <em>Uma moeda</em></tt></p>
-</html>""", tmpl.generate().render())
+</html>""".encode('utf-8'), tmpl.generate().render(encoding='utf-8'))
 def test_extract_i18n_msg_with_other_directives_nested(self):
 tmpl = MarkupTemplate("""<html xmlns:py="http://genshi.edgewall.org/"
 xmlns:i18n="http://genshi.edgewall.org/i18n">
 <p i18n:msg="" py:with="q = quote_plus(message[:80])">Before you do that, though, please first try
 translator.setup(tmpl)
 messages = list(translator.extract(tmpl.stream))
 self.assertEqual(1, len(messages))
 ctx = Context()
 ctx.push({'trac': {'homepage': 'http://trac.edgewall.org/'}})
-self.assertEqual("""<html>
+self.assertEqual(u"""<html>
 <p>Antes de o fazer, porém,
 <strong>por favor tente <a href="http://trac.edgewall.org/search?ticket=yes&amp;noquickjump=1&amp;q=q">procurar</a>
 por problemas semelhantes</strong>, uma vez que é muito provável que este problema
 já tenha sido reportado anteriormente. Para questões relativas à instalação
 e configuração do Trac, por favor tente a
 self.assertEqual(
 '[1:Note:] This repository is defined in\n            '
 '[2:[3:trac.ini]]\n            and cannot be edited on this page.',
 messages[0][2]
 )
-self.assertEqual("""<html>
+self.assertEqual(u"""<html>
 <p class="hint"><strong>Nota:</strong> Este repositório está definido em
 <code><a href="href.wiki(TracIni)">trac.ini</a></code>
 e não pode ser editado nesta página.</p>
-</html>""", tmpl.generate(editable=False).render())
+</html>""".encode('utf-8'), tmpl.generate(editable=False).render(encoding='utf-8'))
 def test_extract_i18n_msg_with_py_strip(self):
 tmpl = MarkupTemplate("""<html xmlns:py="http://genshi.edgewall.org/"
 xmlns:i18n="http://genshi.edgewall.org/i18n">
 <p i18n:msg="" py:strip="">
 def callback(template):
 translator.setup(template)
 loader = TemplateLoader([dirname], callback=callback)
 tmpl = loader.load('tmpl10.html')
+if IS_PYTHON2:
+dgettext = translations.dugettext
+else:
+dgettext = translations.dgettext
 self.assertEqual("""<html>
 <div>Included tmpl0</div>
 <p title="foo_Bar 0">foo_Bar 0</p>
 <p title="bar_Bar">bar_Bar</p>
 <p title="Voh">Voh 0</p>
 <p title="bar_Bar">bar_Bar</p>
 <p title="Voh">Voh 3</p>
 <p title="Voh">Voh 3</p>
 <p title="Voh">Voh 3</p>
 </html>""", tmpl.generate(idx=-1,
-dg=translations.dugettext).render())
+dg=dgettext).render())
 finally:
 shutil.rmtree(dirname)
 class ExtractTestCase(unittest.TestCase):

Mercurial > genshi > genshi-test

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