From c8ccbf9ce876faefb658a3be488fe4c4243d74a9 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 18 Jan 2010 00:41:34 +0100
Subject: [PATCH] Fix test suite.

---
 tests/test_autodoc.py | 24 ++++++++++++------------
 tests/test_markup.py  |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/test_autodoc.py b/tests/test_autodoc.py
index 297239ae9..eb20781d8 100644
--- a/tests/test_autodoc.py
+++ b/tests/test_autodoc.py
@@ -97,28 +97,28 @@ def test_parse_name():
     verify('function', 'util.raises', ('util', ['raises'], None, None))
     verify('function', 'util.raises(exc) -> None',
            ('util', ['raises'], 'exc', 'None'))
-    directive.env.doc_read_data['autodoc:module'] = 'util'
+    directive.env.temp_data['autodoc:module'] = 'util'
     verify('function', 'raises', ('util', ['raises'], None, None))
-    del directive.env.doc_read_data['autodoc:module']
-    directive.env.doc_read_data['py:module'] = 'util'
+    del directive.env.temp_data['autodoc:module']
+    directive.env.temp_data['py:module'] = 'util'
     verify('function', 'raises', ('util', ['raises'], None, None))
     verify('class', 'TestApp', ('util', ['TestApp'], None, None))
 
     # for members
-    directive.env.doc_read_data['py:module'] = 'foo'
+    directive.env.temp_data['py:module'] = 'foo'
     verify('method', 'util.TestApp.cleanup',
            ('util', ['TestApp', 'cleanup'], None, None))
-    directive.env.doc_read_data['py:module'] = 'util'
-    directive.env.doc_read_data['py:class'] = 'Foo'
-    directive.env.doc_read_data['autodoc:class'] = 'TestApp'
+    directive.env.temp_data['py:module'] = 'util'
+    directive.env.temp_data['py:class'] = 'Foo'
+    directive.env.temp_data['autodoc:class'] = 'TestApp'
     verify('method', 'cleanup', ('util', ['TestApp', 'cleanup'], None, None))
     verify('method', 'TestApp.cleanup',
            ('util', ['TestApp', 'cleanup'], None, None))
 
     # and clean up
-    del directive.env.doc_read_data['py:module']
-    del directive.env.doc_read_data['py:class']
-    del directive.env.doc_read_data['autodoc:class']
+    del directive.env.temp_data['py:module']
+    del directive.env.temp_data['py:class']
+    del directive.env.temp_data['autodoc:class']
 
 
 def test_format_signature():
@@ -353,7 +353,7 @@ def test_generate():
                  'function', 'util.foobar', more_content=None)
 
     # test auto and given content mixing
-    directive.env.doc_read_data['py:module'] = 'test_autodoc'
+    directive.env.temp_data['py:module'] = 'test_autodoc'
     assert_result_contains('   Function.', 'method', 'Class.meth')
     add_content = ViewList()
     add_content.append('Content.', '', 0)
@@ -437,7 +437,7 @@ def test_generate():
                            'attribute', 'test_autodoc.Class.descr')
 
     # test generation for C modules (which have no source file)
-    directive.env.doc_read_data['py:module'] = 'time'
+    directive.env.temp_data['py:module'] = 'time'
     assert_processes([('function', 'time.asctime')], 'function', 'asctime')
     assert_processes([('function', 'time.asctime')], 'function', 'asctime')
 
diff --git a/tests/test_markup.py b/tests/test_markup.py
index 26c20cf91..1023528d4 100644
--- a/tests/test_markup.py
+++ b/tests/test_markup.py
@@ -29,7 +29,7 @@ def setup_module():
     settings = optparser.get_default_values()
     settings.env = app.builder.env
     settings.env.patch_lookup_functions()
-    settings.env.doc_read_data['docname'] = 'dummy'
+    settings.env.temp_data['docname'] = 'dummy'
     parser = rst.Parser()
 
 def teardown_module():