From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 20 Jul 2009 21:09:45 +0000 (+0000)
Subject: Merged revisions 74121-74122 via svnmerge from
X-Git-Tag: v2.7a1~733
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d4b7398a283da7f8cf0e2f7bc7abd9a054b169f;p=thirdparty%2FPython%2Fcpython.git

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
........
---

diff --git a/Lib/lib2to3/tests/test_fixers.py b/Lib/lib2to3/tests/test_fixers.py
index a19de9541d50..d071b2e22305 100755
--- a/Lib/lib2to3/tests/test_fixers.py
+++ b/Lib/lib2to3/tests/test_fixers.py
@@ -3556,7 +3556,7 @@ class Test_import(FixerTestCase):
         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):
diff --git a/Lib/lib2to3/tests/test_pytree.py b/Lib/lib2to3/tests/test_pytree.py
index a162aaebf90d..870970c6670f 100755
--- a/Lib/lib2to3/tests/test_pytree.py
+++ b/Lib/lib2to3/tests/test_pytree.py
@@ -31,6 +31,7 @@ class TestNodes(support.TestCase):
     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")
diff --git a/Lib/lib2to3/tests/test_refactor.py b/Lib/lib2to3/tests/test_refactor.py
index 39ed54508a3a..cc47b9d9c244 100644
--- a/Lib/lib2to3/tests/test_refactor.py
+++ b/Lib/lib2to3/tests/test_refactor.py
@@ -46,6 +46,7 @@ class TestRefactoringTool(unittest.TestCase):
 
     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