Rename testgetmassagecatalog to .rst and publish it.

6 files changed, 34 insertions, 29 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index ea5dc2b..e4564d6 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include buildout.cfg
 include .travis.yml
 include tox.ini
 include .coveragerc
+
 recursive-include src *.txt *.py *.dtd *.xml *.html *.po *.mo *.in *.zcml
 recursive-include src *.py
 recursive-include src *.dtd
@@ -15,6 +16,7 @@ recursive-include src *.po
 recursive-include src *.mo
 recursive-include src *.in
 recursive-include src *.zcml
+recursive-include src *.rst
 
 recursive-include src/zope/i18n/tests *.mo
 recursive-include docs *.rst
diff --git a/docs/index.rst b/docs/index.rst
index e8dbcf0..0c01630 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -7,6 +7,7 @@ Contents:
    :maxdepth: 2
 
    api
+   testing
    changelog
 
 ====================
diff --git a/docs/testing.rst b/docs/testing.rst
new file mode 100644
index 0000000..d0bc8ef
--- /dev/null
+++ b/docs/testing.rst
@@ -0,0 +1 @@
+.. include:: ../src/zope/i18n/testmessagecatalog.rst
diff --git a/src/zope/i18n/testmessagecatalog.py b/src/zope/i18n/testmessagecatalog.py
index 804c6a8..8420c58 100644
--- a/src/zope/i18n/testmessagecatalog.py
+++ b/src/zope/i18n/testmessagecatalog.py
@@ -19,7 +19,7 @@ import zope.i18n.interfaces
 from zope.i18n.translationdomain import TranslationDomain
 
 @interface.implementer(zope.i18n.interfaces.IGlobalMessageCatalog)
-class TestMessageCatalog:
+class TestMessageCatalog(object):
 
     language = 'test'
 
diff --git a/src/zope/i18n/testmessagecatalog.txt b/src/zope/i18n/testmessagecatalog.rst
index dc1d9d0..8cf4148 100644
--- a/src/zope/i18n/testmessagecatalog.txt
+++ b/src/zope/i18n/testmessagecatalog.rst
@@ -1,8 +1,9 @@
-Test Message Catalog
-====================
+======================
+ Test Message Catalog
+======================
 
-The test message catalog "translates" test by simply outputing the
-domain and message id in square-bracket markers:
+The test message catalog "translates" test by simply outputing (in
+unicode) the domain and message id in square-bracket markers:
 
     >>> import zope.i18n.testmessagecatalog
     >>> cat = zope.i18n.testmessagecatalog.TestMessageCatalog('foo.bar')
@@ -10,11 +11,14 @@ domain and message id in square-bracket markers:
     >>> cat.language, cat.domain
     ('test', 'foo.bar')
 
-    >>> cat.queryMessage('eek')
-    u'[[foo.bar][eek]]'
+    >>> print(cat.queryMessage('eek'))
+    [[foo.bar][eek]]
 
-    >>> cat.getMessage('eek')
-    u'[[foo.bar][eek]]'
+    >>> print(cat.getMessage('eek'))
+    [[foo.bar][eek]]
+
+    >>> isinstance(cat.getMessage('eek'), str if bytes is not str else unicode)
+    True
 
     >>> cat.getIdentifier()
     'test'
@@ -25,23 +29,23 @@ If a message id has a default, it will be included in the output:
 
     >>> id = zope.i18nmessageid.MessageFactory('foo.bar')('eek', default='Eek')
 
-    >>> cat.queryMessage(id)
-    u'[[foo.bar][eek (Eek)]]'
+    >>> print(cat.queryMessage(id))
+    [[foo.bar][eek (Eek)]]
 
-    >>> cat.getMessage(id)
-    u'[[foo.bar][eek (Eek)]]'
+    >>> print(cat.getMessage(id))
+    [[foo.bar][eek (Eek)]]
 
 If a message doesn't have a default, but a default is passed in to
 queryMessage, the default will be used used:
 
-    >>> cat.queryMessage('eek', default='Eek')
-    u'[[foo.bar][eek (Eek)]]'
+    >>> print(cat.queryMessage('eek', default='Eek'))
+    [[foo.bar][eek (Eek)]]
 
-    >>> cat.getMessage(id, default='Waaa')
-    u'[[foo.bar][eek (Eek)]]'
+    >>> print(cat.getMessage(id, default='Waaa'))
+    [[foo.bar][eek (Eek)]]
 
 Fallback domains
-----------------
+================
 
 The testmessagecatalog module also provide a fallback domain factory
 that has the test catalog as it's only catalog:
@@ -53,14 +57,14 @@ that has the test catalog as it's only catalog:
     True
 
     >>> domain = factory('foo.bar')
-    >>> domain.translate('eek')
-    u'eek'
+    >>> print(domain.translate('eek'))
+    eek
 
-    >>> domain.translate('eek', target_language='test')
-    u'[[foo.bar][eek]]'
+    >>> print(domain.translate('eek', target_language='test'))
+    [[foo.bar][eek]]
 
 Note that if a default is padded in, it will be included in test
 output:
 
-    >>> domain.translate('eek', target_language='test', default='Eek')
-    u'[[foo.bar][eek (Eek)]]'
+    >>> print(domain.translate('eek', target_language='test', default='Eek'))
+    [[foo.bar][eek (Eek)]]
diff --git a/src/zope/i18n/tests/test_testmessagecatalog.py b/src/zope/i18n/tests/test_testmessagecatalog.py
index 62c2dd8..ce5adc6 100644
--- a/src/zope/i18n/tests/test_testmessagecatalog.py
+++ b/src/zope/i18n/tests/test_testmessagecatalog.py
@@ -15,13 +15,10 @@
 import unittest
 import doctest
 
-from zope.i18n.testing import unicode_checker
-
 def test_suite():
     return unittest.TestSuite((
-        doctest.DocFileSuite('../testmessagecatalog.txt', checker=unicode_checker),
-        ))
+        doctest.DocFileSuite('../testmessagecatalog.rst')
+    ))
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')
-