commit 4d4b7398a283da7f8cf0e2f7bc7abd9a054b169f
author Benjamin Peterson <benjamin@python.org> Mon Jul 20 21:09:45 2009 +0000
committer Benjamin Peterson <benjamin@python.org> Mon Jul 20 21:09:45 2009 +0000
tree c7daac983c574646c66909fff77d2aeb348ce2d9
parent 4879c907ce32655e76c74aee9f49e4be99b862af

Merged revisions 74121-74122 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

........
  r74121 | benjamin.peterson | 2009-07-20 15:40:59 -0500 (Mon, 20 Jul 2009) | 1 line

  try to make warning tests more robust
........
  r74122 | benjamin.peterson | 2009-07-20 15:44:14 -0500 (Mon, 20 Jul 2009) | 1 line

  platform compat
........

Lib/lib2to3/tests/test_fixers.py

diff --git a/Lib/lib2to3/tests/test_fixers.py b/Lib/lib2to3/tests/test_fixers.py
index a19de95..d071b2e 100755
--- a/Lib/lib2to3/tests/test_fixers.py
+++ b/Lib/lib2to3/tests/test_fixers.py
@@ -3556,7 +3556,7 @@
         b = "import bar"
         a = "from . import bar"
         self.always_exists = False
-        self.present_files = set(["__init__.py", "bar/"])
+        self.present_files = set(["__init__.py", "bar" + os.path.sep])
         self.check(b, a)
 
     def test_comments_and_indent(self):

Lib/lib2to3/tests/test_pytree.py

diff --git a/Lib/lib2to3/tests/test_pytree.py b/Lib/lib2to3/tests/test_pytree.py
index a162aae..870970c 100755
--- a/Lib/lib2to3/tests/test_pytree.py
+++ b/Lib/lib2to3/tests/test_pytree.py
@@ -31,6 +31,7 @@
     def test_deprecated_prefix_methods(self):
         l = pytree.Leaf(100, "foo")
         with warnings.catch_warnings(record=True) as w:
+            warnings.simplefilter("always", DeprecationWarning)
             self.assertEqual(l.get_prefix(), "")
             l.set_prefix("hi")
         self.assertEqual(l.prefix, "hi")

Lib/lib2to3/tests/test_refactor.py

diff --git a/Lib/lib2to3/tests/test_refactor.py b/Lib/lib2to3/tests/test_refactor.py
index 39ed545..cc47b9d 100644
--- a/Lib/lib2to3/tests/test_refactor.py
+++ b/Lib/lib2to3/tests/test_refactor.py
@@ -46,6 +46,7 @@
 
     def test_print_function_option(self):
         with warnings.catch_warnings(record=True) as w:
+            warnings.simplefilter("always", DeprecationWarning)
             refactor.RefactoringTool(_DEFAULT_FIXERS, {"print_function" : True})
         self.assertEqual(len(w), 1)
         msg, = w