Kaydet (Commit) a31bf18c authored tarafından Neal Norwitz's avatar Neal Norwitz

glob('anything*/') would fail because isdir is in os.path, not os.

üst e0bb597d
...@@ -60,7 +60,7 @@ def glob0(dirname, basename): ...@@ -60,7 +60,7 @@ def glob0(dirname, basename):
if basename == '': if basename == '':
# `os.path.split()` returns an empty basename for paths ending with a # `os.path.split()` returns an empty basename for paths ending with a
# directory separator. 'q*x/' should match only directories. # directory separator. 'q*x/' should match only directories.
if os.isdir(dirname): if os.path.isdir(dirname):
return [basename] return [basename]
else: else:
if os.path.lexists(os.path.join(dirname, basename)): if os.path.lexists(os.path.join(dirname, basename)):
......
...@@ -80,6 +80,14 @@ class GlobTests(unittest.TestCase): ...@@ -80,6 +80,14 @@ class GlobTests(unittest.TestCase):
eq(self.glob('?a?', '*F'), map(self.norm, [os.path.join('aaa', 'zzzF'), eq(self.glob('?a?', '*F'), map(self.norm, [os.path.join('aaa', 'zzzF'),
os.path.join('aab', 'F')])) os.path.join('aab', 'F')]))
def test_glob_directory_with_trailing_slash(self):
# We are verifying that when there is wildcard pattern which
# ends with os.sep doesn't blow up.
res = glob.glob(self.tempdir + '*' + os.sep)
self.assertEqual(len(res), 1)
# either of these results are reasonable
self.assertTrue(res[0] in [self.tempdir, self.tempdir + os.sep])
def test_glob_broken_symlinks(self): def test_glob_broken_symlinks(self):
if hasattr(os, 'symlink'): if hasattr(os, 'symlink'):
eq = self.assertSequencesEqual_noorder eq = self.assertSequencesEqual_noorder
......
...@@ -20,6 +20,8 @@ Extension Modules ...@@ -20,6 +20,8 @@ Extension Modules
Library Library
------- -------
- Fix exception when doing glob.glob('anything*/')
Build Build
----- -----
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment