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 12:51:07 +00:00
parent bfc3099f38
commit c8832655f9
3 changed files with 4 additions and 2 deletions

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