mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 03:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merged revisions 74135 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r74135 | benjamin.peterson | 2009-07-21 07:51:07 -0500 (Tue, 21 Jul 2009) | 31 lines

  Merged revisions 74117,74123 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ................
    r74117 | benjamin.peterson | 2009-07-20 12:24:30 -0500 (Mon, 20 Jul 2009) | 9 lines

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

    ........
      r74116 | benjamin.peterson | 2009-07-20 12:22:35 -0500 (Mon, 20 Jul 2009) | 1 line

      placate windows
    ........
  ................
    r74123 | benjamin.peterson | 2009-07-20 16:09:45 -0500 (Mon, 20 Jul 2009) | 13 lines

    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
    ........
  ................
................
This commit is contained in:
Benjamin Peterson 2009-07-21 13:13:16 +00:00
parent dd6a4edc45
commit 784935ffc9
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/lib2to3/tests/test_fixers.py
View file

@ -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):

1
Lib/lib2to3/tests/test_pytree.py
View file

@ -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")

3
Lib/lib2to3/tests/test_refactor.py
View file

@ -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
@ -215,7 +216,7 @@ from __future__ import print_function"""
expected = ["hi.py"]
check(tree, expected)
tree = ["hi.py",
"a_dir/stuff.py"]
os.path.join("a_dir", "stuff.py")]
check(tree, tree)
def test_file_encoding(self):