Index: Lib/test/test_pyexpat.py
===================================================================
--- Lib/test/test_pyexpat.py	(revision 70341)
+++ Lib/test/test_pyexpat.py	(working copy)
@@ -130,12 +130,20 @@
         'ExternalEntityRefHandler'
         ]
 
+    def _hookup_callbacks(self, parser, handler):
+        """
+        Set each of the callbacks defined on handler and named in
+        self.handler_names on the given parser.
+        """
+        for name in self.handler_names:
+            setattr(parser, name, getattr(handler, name))
+        
+
     def test_utf8(self):
 
         out = self.Outputter()
         parser = expat.ParserCreate(namespace_separator='!')
-        for name in self.handler_names:
-            setattr(parser, name, getattr(out, name))
+        self._hookup_callbacks(parser, out)
         parser.returns_unicode = 0
         parser.Parse(data, 1)
 
@@ -164,8 +172,7 @@
         out = self.Outputter()
         parser = expat.ParserCreate(namespace_separator='!')
         parser.returns_unicode = 1
-        for name in self.handler_names:
-            setattr(parser, name, getattr(out, name))
+        self._hookup_callbacks(parser, out)
 
         parser.Parse(data, 1)
 
@@ -193,8 +200,7 @@
         out = self.Outputter()
         parser = expat.ParserCreate(namespace_separator='!')
         parser.returns_unicode = 1
-        for name in self.handler_names:
-            setattr(parser, name, getattr(out, name))
+        self._hookup_callbacks(parser, out)
         file = StringIO.StringIO(data)
 
         parser.ParseFile(file)
@@ -219,6 +225,7 @@
         self.assertEquals(op[16], "End element: u'root'")
 
 
+
 class NamespaceSeparatorTest(unittest.TestCase):
     def test_legal(self):
         # Tests that make sure we get errors when the namespace_separator value
@@ -560,6 +567,28 @@
         self.assertEquals(self.n, 4)
 
 
+class ForeignDTDTests(unittest.TestCase):
+    """
+    Tests for the UseForeignDTD method of expat parser objects.
+    """
+    def test_use_foreign_dtd(self):
+        """
+        If UseForeignDTD is passed True, if a document without an external
+        entity reference is parsed, ExternalEntityRefHandler is first called
+        with None for the public and system ids.
+        """
+        handler_call_args = []
+        def resolve_entity(context, base, system_id, public_id):
+            handler_call_args.append((public_id, system_id))
+            return None
+
+        parser = expat.ParserCreate()
+        parser.UseForeignDTD(True)
+        parser.ExternalEntityRefHandler = resolve_entity
+        parser.Parse("<?xml version='1.0'><element/>")
+        self.assertEquals(handler_call_args, [(None, None)])
+
+
 def test_main():
     run_unittest(SetAttributeTest,
                  ParseTest,
@@ -569,7 +598,8 @@
                  HandlerExceptionTest,
                  PositionTest,
                  sf1296433Test,
-                 ChardataBufferTest)
+                 ChardataBufferTest,
+                 ForeignDTDTests)
 
 if __name__ == "__main__":
     test_main()