diff -r 6f8b5336beae Lib/glob.py --- a/Lib/glob.py Mon Dec 03 21:09:08 2012 +0100 +++ b/Lib/glob.py Wed Dec 05 19:05:28 2012 +0200 @@ -55,8 +55,8 @@ names = os.listdir(dirname) except os.error: return [] - if pattern[0] != '.': - names = [x for x in names if x[0] != '.'] + if not _ishidden(pattern): + names = [x for x in names if not _ishidden(x)] return fnmatch.filter(names, pattern) def glob0(dirname, basename): @@ -80,3 +80,6 @@ else: match = magic_check.search(s) return match is not None + +def _ishidden(path): + return path[0] in ('.', b'.'[0]) diff -r 6f8b5336beae Lib/test/test_glob.py --- a/Lib/test/test_glob.py Mon Dec 03 21:09:08 2012 +0100 +++ b/Lib/test/test_glob.py Wed Dec 05 19:05:28 2012 +0200 @@ -25,9 +25,12 @@ self.mktemp('ZZZ') self.mktemp('a', 'bcd', 'EF') self.mktemp('a', 'bcd', 'efg', 'ha') + self.mktemp('.hidden') + self.mktemp('a', '.hidden') if can_symlink(): os.symlink(self.norm('broken'), self.norm('sym1')) - os.symlink(self.norm('broken'), self.norm('sym2')) + os.symlink('broken', self.norm('sym2')) + os.symlink(os.path.join('a', 'bcd'), self.norm('sym3')) def tearDown(self): shutil.rmtree(self.tempdir) @@ -40,10 +43,16 @@ p = os.path.join(self.tempdir, pattern) res = glob.glob(p) self.assertEqual(list(glob.iglob(p)), res) + bres = [x.encode() for x in res] + self.assertEqual(glob.glob(p.encode()), bres) + self.assertEqual(list(glob.iglob(p.encode())), bres) return res def assertSequencesEqual_noorder(self, l1, l2): + l1 = list(l1) + l2 = list(l2) self.assertEqual(set(l1), set(l2)) + self.assertEqual(sorted(l1), sorted(l2)) def test_glob_literal(self): eq = self.assertSequencesEqual_noorder @@ -54,13 +63,23 @@ # test return types are unicode, but only if os.listdir # returns unicode filenames - uniset = set([str]) - tmp = os.listdir('.') - if set(type(x) for x in tmp) == uniset: + uniset = {str} + tmp = os.listdir(os.curdir) + if {type(x) for x in tmp} == uniset: u1 = glob.glob('*') - u2 = glob.glob('./*') - self.assertEqual(set(type(r) for r in u1), uniset) - self.assertEqual(set(type(r) for r in u2), uniset) + u2 = glob.glob(os.path.join(os.curdir, '*')) + self.assertEqual({type(r) for r in u1}, uniset) + self.assertEqual({type(r) for r in u2}, uniset) + + # test return types are bytes, but only if os.listdir + # returns bytes filenames + bytset = {bytes} + tmp = os.listdir(os.curdir.encode()) + if {type(x) for x in tmp} == bytset: + u1 = glob.glob(b'*') + u2 = glob.glob(os.path.join(os.curdir.encode(), b'*')) + self.assertEqual({type(r) for r in u1}, bytset) + self.assertEqual({type(r) for r in u2}, bytset) def test_glob_one_directory(self): eq = self.assertSequencesEqual_noorder @@ -97,11 +116,24 @@ self.assertEqual(len(res), 1) # either of these results are reasonable self.assertIn(res[0], [self.tempdir, self.tempdir + os.sep]) + eq = self.assertSequencesEqual_noorder + eq(self.glob('a*', ''), [os.path.join(self.tempdir, x, '') + for x in ['a', 'aaa', 'aab']]) + + @skip_unless_symlink + def test_glob_symlinks(self): + eq = self.assertSequencesEqual_noorder + eq(self.glob('sym3'), [self.norm('sym3')]) + eq(self.glob('sym3', '*'), [self.norm('sym3', 'EF'), + self.norm('sym3', 'efg')]) + eq(self.glob('*', '*F'), [self.norm('aaa', 'zzzF'), + self.norm('aab', 'F'), self.norm('sym3', 'EF')]) @skip_unless_symlink def test_glob_broken_symlinks(self): eq = self.assertSequencesEqual_noorder - eq(self.glob('sym*'), [self.norm('sym1'), self.norm('sym2')]) + eq(self.glob('sym*'), [self.norm('sym1'), self.norm('sym2'), + self.norm('sym3')]) eq(self.glob('sym1'), [self.norm('sym1')]) eq(self.glob('sym2'), [self.norm('sym2')])