This commit was manufactured by cvs2svn to create tag

'merged_to_RC_1_33_0'.

[SVN r31853]

test/polymorphism2.py

@@ -2,7 +2,7 @@
 # Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 import unittest
-from polymorphism2_ext import *
+import sys
 
 class PolymorphTest(unittest.TestCase):
 
@@ -77,11 +77,18 @@ class PolymorphTest(unittest.TestCase):
       r = R()
       self.failUnlessEqual ('R.f', r.f())
       
-                        
-if __name__ == "__main__":
-   
-   # remove the option which upsets unittest
+
+def test():
+   # remove the option that upsets unittest
    import sys
    sys.argv = [ x for x in sys.argv if x != '--broken-auto-ptr' ]
-   
    unittest.main()
+
+# This nasty hack basically says that if we're loaded by another module, we'll
+# be testing polymorphism2_auto_ptr_ext instead of polymorphism2_ext.
+if __name__ == "__main__":
+   from polymorphism2_ext import *
+   test()
+else:
+   from polymorphism2_auto_ptr_ext import *
+