[Zope-Checkins] CVS: Packages/TAL/tests - test_htmltalparser.py:1.32.2.3 test_talinterpreter.py:1.6.12.4

[Fred L. Drake, Jr.]

Update of /cvs-repository/Packages/TAL/tests
In directory cvs.zope.org:/tmp/cvs-serv15306/lib/python/TAL/tests

Modified Files:
      Tag: Zope-2_7-branch
	test_htmltalparser.py test_talinterpreter.py 
Log Message:
Fix for issue 233 in the Zope 3 collector.
This corresponds to the Hotfix_2004-07-13 product.


=== Packages/TAL/tests/test_htmltalparser.py 1.32.2.2 => 1.32.2.3 ===
--- Packages/TAL/tests/test_htmltalparser.py:1.32.2.2	Fri Aug 15 10:14:40 2003
+++ Packages/TAL/tests/test_htmltalparser.py	Tue Jul 13 14:15:05 2004
@@ -594,7 +594,8 @@
          ('span',
           [('tal:replace', 'str:Lomax', 'tal'),
            ('i18n:name', 'name', 'i18n')]))],
-       '$str:Lomax$')),
+       '$str:Lomax$',
+       0)),
      ('rawtextBeginScope',
       (' was born in\n  ',
        2,
@@ -607,7 +608,8 @@
          ('span',
           [('tal:replace', 'str:Antarctica', 'tal'),
            ('i18n:name', 'country', 'i18n')]))],
-       '$str:Antarctica$')),
+       '$str:Antarctica$',
+       0)),
      ('endScope', ()),
      ('rawtextColumn', ('.\n', 0))])),
   ('endScope', ()),
@@ -638,7 +640,8 @@
            ('',
              [('insertText', ('$bar$', []))])),
          ('rawtextOffset', ('</span>', 7))],
-      None)),
+      None,
+        0)),
    ('endScope', ()),
    ('rawtextOffset', ('.', 1))])),
 ('endScope', ()),
@@ -662,12 +665,12 @@
     [('rawtextBeginScope', ('\n  ', 2, (2, 2), 0, {'i18n:name': 'name'})),
      ('i18nVariable',
       ('name',
-       [('rawtextOffset', ('<b>Jim</b>', 10))], None)),
+       [('rawtextOffset', ('<b>Jim</b>', 10))], None, 0)),
      ('rawtextBeginScope',
       (' was born in\n  ', 2, (3, 2), 1, {'i18n:name': 'country'})),
      ('i18nVariable',
       ('country',
-       [('rawtextOffset', ('the USA', 7))], None)),
+       [('rawtextOffset', ('the USA', 7))], None, 0)),
      ('endScope', ()),
      ('rawtextColumn', ('.\n', 0))])),
   ('endScope', ()),
@@ -782,7 +785,7 @@
          [('i18n:data', 'here/currentTime', 'i18n'),
           ('i18n:translate', 'timefmt', 'i18n'),
           ('i18n:name', 'time', 'i18n')])),
-       ('i18nVariable', ('time', [], None))],
+       ('i18nVariable', ('time', [], None, 0))],
       '$here/currentTime$')),
     ('endScope', ()),
     ('rawtextOffset', ('... beep!', 9))])),
@@ -816,7 +819,8 @@
            ('i18n:name', 'jobnum', 'i18n')])),
         ('rawtextOffset', ('NN', 2)),
         ('rawtextOffset', ('</span>', 7))],
-       '$context/@@object_name$')),
+       '$context/@@object_name$',
+       0)),
      ('endScope', ())])),
   ('endScope', ()),
   ('rawtextColumn', ('</span>\n', 0))
@@ -860,7 +864,8 @@
           [('rawtextOffset', ('user at host.com', 13))])),
         ('endScope', ()),
         ('rawtextOffset', ('</a>', 4))],
-       None)),
+       None,
+       0)),
      ('endScope', ()),
      ('rawtextColumn', ('\n', 0))])),
   ('endScope', ()),
@@ -900,7 +905,8 @@
          ('$request/submitter$',
           [('rawtextOffset', ('user at host.com', 13))])),
         ('rawtextOffset', ('</a>', 4))],
-       None)),
+       None,
+       0)),
      ('endScope', ()),
      ('rawtextColumn', ('\n', 0))])),
   ('endScope', ()),


=== Packages/TAL/tests/test_talinterpreter.py 1.6.12.3 => 1.6.12.4 ===
--- Packages/TAL/tests/test_talinterpreter.py:1.6.12.3	Wed Oct  1 13:14:57 2003
+++ Packages/TAL/tests/test_talinterpreter.py	Tue Jul 13 14:15:05 2004
@@ -94,7 +94,7 @@
                     '<div>THIS IS TEXT FOR <span>BARVALUE</span>.</div>\n')
 
     def test_translate_static_text_as_dynamic_from_bytecode(self):
-        program =  [('version', '1.4'),
+        program =  [('version', '1.5'),
  ('mode', 'html'),
 ('setPosition', (1, 0)),
 ('beginScope', {'i18n:translate': ''}),
@@ -116,7 +116,8 @@
            ('',
              [('insertText', ('$bar$', []))])),
          ('rawtextOffset', ('</span>', 7))],
-      None)),
+        None,
+        0)),
    ('endScope', ()),
    ('rawtextOffset', ('.', 1))])),
 ('endScope', ()),