[Checkins] SVN: zope.i18nmessageid/branches/regebro-python3/s Fixed up all the unicode in doctest outputs, so doctests pass.

Lennart Regebro regebro at gmail.com
Fri Nov 19 05:39:08 EST 2010


Log message for revision 118482:
  Fixed up all the unicode in doctest outputs, so doctests pass.
  

Changed:
  U   zope.i18nmessageid/branches/regebro-python3/setup.py
  U   zope.i18nmessageid/branches/regebro-python3/src/zope/i18nmessageid/message.py
  U   zope.i18nmessageid/branches/regebro-python3/src/zope/i18nmessageid/messages.txt

-=-
Modified: zope.i18nmessageid/branches/regebro-python3/setup.py
===================================================================
--- zope.i18nmessageid/branches/regebro-python3/setup.py	2010-11-19 10:31:45 UTC (rev 118481)
+++ zope.i18nmessageid/branches/regebro-python3/setup.py	2010-11-19 10:39:08 UTC (rev 118482)
@@ -31,7 +31,7 @@
 if sys.version_info >= (3,):
     extra = dict(use_2to3 = True,
                  convert_2to3_doctests = [
-                     'src/zope/i18messageis/messages.txt',
+                     'src/zope/i18nmessageid/messages.txt',
                      ],
                  dependency_links = ['.'],
                  )

Modified: zope.i18nmessageid/branches/regebro-python3/src/zope/i18nmessageid/message.py
===================================================================
--- zope.i18nmessageid/branches/regebro-python3/src/zope/i18nmessageid/message.py	2010-11-19 10:31:45 UTC (rev 118481)
+++ zope.i18nmessageid/branches/regebro-python3/src/zope/i18nmessageid/message.py	2010-11-19 10:39:08 UTC (rev 118482)
@@ -30,13 +30,13 @@
     >>> from zope.i18nmessageid.message import Message
     >>> robot = Message(u"robot-message", 'futurama', u"${name} is a robot.")
 
-    >>> robot
-    u'robot-message'
+    >>> robot == u'robot-message'
+    True
     >>> isinstance(robot, unicode)
     True
 
-    >>> robot.default
-    u'${name} is a robot.'
+    >>> robot.default == u'${name} is a robot.'
+    True
     >>> robot.mapping
 
     >>> robot.domain = "planetexpress"
@@ -55,34 +55,34 @@
     TypeError: readonly attribute
 
     >>> new_robot = Message(robot, mapping={u'name': u'Bender'})
-    >>> new_robot
-    u'robot-message'
-    >>> new_robot.domain
-    'futurama'
-    >>> new_robot.default
-    u'${name} is a robot.'
-    >>> new_robot.mapping
-    {u'name': u'Bender'}
+    >>> new_robot == u'robot-message'
+    True
+    >>> new_robot.domain == 'futurama'
+    True
+    >>> new_robot.default == u'${name} is a robot.'
+    True
+    >>> new_robot.mapping == {u'name': u'Bender'}
+    True
 
     >>> callable, args = new_robot.__reduce__()
     >>> callable is Message
     True
-    >>> args
-    (u'robot-message', 'futurama', u'${name} is a robot.', {u'name': u'Bender'})
+    >>> args == (u'robot-message', 'futurama', u'${name} is a robot.', {u'name': u'Bender'})
+    True
 
     >>> fembot = Message(u'fembot')
     >>> callable, args = fembot.__reduce__()
     >>> callable is Message
     True
-    >>> args
-    (u'fembot', None, None, None)
+    >>> args == (u'fembot', None, None, None)
+    True
 
     Check if pickling and unpickling works
     >>> from pickle import dumps, loads
     >>> pystate = dumps(new_robot)
     >>> pickle_bot = loads(pystate)
-    >>> pickle_bot, pickle_bot.domain, pickle_bot.default, pickle_bot.mapping
-    (u'robot-message', 'futurama', u'${name} is a robot.', {u'name': u'Bender'})
+    >>> (pickle_bot, pickle_bot.domain, pickle_bot.default, pickle_bot.mapping) == (u'robot-message', 'futurama', u'${name} is a robot.', {u'name': u'Bender'})
+    True
     >>> pickle_bot.__reduce__()[0] is Message
     True
     """

Modified: zope.i18nmessageid/branches/regebro-python3/src/zope/i18nmessageid/messages.txt
===================================================================
--- zope.i18nmessageid/branches/regebro-python3/src/zope/i18nmessageid/messages.txt	2010-11-19 10:31:45 UTC (rev 118481)
+++ zope.i18nmessageid/branches/regebro-python3/src/zope/i18nmessageid/messages.txt	2010-11-19 10:39:08 UTC (rev 118482)
@@ -48,16 +48,16 @@
 
 Messages at first seem like they are unicode strings:
 
-  >>> robot
-  u'robot-message'
+  >>> robot == u'robot-message'
+  True
   >>> isinstance(robot, unicode)
   True
 
 The additional domain, default and mapping information is available
 through attributes:
 
-  >>> robot.default
-  u'${name} is a robot.'
+  >>> robot.default == u'${name} is a robot.'
+  True
   >>> robot.mapping
   >>> robot.domain
   'futurama'
@@ -84,31 +84,30 @@
 message id object:
 
   >>> new_robot = Message(robot, mapping={u'name': u'Bender'})
-  >>> new_robot
-  u'robot-message'
+  >>> new_robot == u'robot-message'
+  True
   >>> new_robot.domain
   'futurama'
-  >>> new_robot.default
-  u'${name} is a robot.'
-  >>> new_robot.mapping
-  {u'name': u'Bender'}
+  >>> new_robot.default == u'${name} is a robot.'
+  True
+  >>> new_robot.mapping == {u'name': u'Bender'}
+  True
 
 Last but not least, messages are reduceable for pickling:
 
   >>> callable, args = new_robot.__reduce__()
   >>> callable is Message
   True
-  >>> args
-  (u'robot-message', 'futurama', u'${name} is a robot.', {u'name': u'Bender'})
+  >>> args == (u'robot-message', 'futurama', u'${name} is a robot.', {u'name': u'Bender'})
+  True
 
   >>> fembot = Message(u'fembot')
   >>> callable, args = fembot.__reduce__()
   >>> callable is Message
   True
-  >>> args
-  (u'fembot', None, None, None)
+  >>> args == (u'fembot', None, None, None)
+  True
 
-
 Message IDs and backward compatability
 --------------------------------------
 



More information about the checkins mailing list