Use glob.iglob

sebastinas · sebastinas · commit 601df715e0d0 · 2015-02-24T14:24:58.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -163,11 +163,11 @@ def __init__(self):
 
     if sys.version_info[:2] >= (3, 4):
         def safe_glob(self, pathname):
-            return glob.glob(glob.escape(pathname) + '*')
+            return glob.iglob(glob.escape(pathname) + '*')
     else:
         def safe_glob(self, pathname):
             try:
-                return glob.glob(pathname + '*')
+                return glob.iglob(pathname + '*')
             except re.error:
                 # see #491
                 return tuple()
diff --git a/bpython/test/test_autocomplete.py b/bpython/test/test_autocomplete.py
@@ -123,15 +123,15 @@ def test_locate_fails_when_not_in_string(self):
     def test_locate_succeeds_when_in_string(self):
         self.assertEqual(self.completer.locate(4, "a'bc'd"), (2, 4, 'bc'))
 
-    @mock.patch('glob.glob', new=lambda text: [])
+    @mock.patch('glob.iglob', new=lambda text: [])
     def test_match_returns_none_if_not_in_string(self):
         self.assertEqual(self.completer.matches(2, 'abcd'), None)
 
-    @mock.patch('glob.glob', new=lambda text: [])
+    @mock.patch('glob.iglob', new=lambda text: [])
     def test_match_returns_empty_list_when_no_files(self):
         self.assertEqual(self.completer.matches(2, '"a'), set())
 
-    @mock.patch('glob.glob',
+    @mock.patch('glob.iglob',
                 new=lambda text: ['abcde', 'aaaaa'])
     @mock.patch('os.path.expanduser', new=lambda text: text)
     @mock.patch('os.path.isdir', new=lambda text: False)
@@ -140,7 +140,7 @@ def test_match_returns_files_when_files_exist(self):
         self.assertEqual(sorted(self.completer.matches(2, '"x')),
                          ['aaaaa', 'abcde'])
 
-    @mock.patch('glob.glob',
+    @mock.patch('glob.iglob',
                 new=lambda text: ['abcde', 'aaaaa'])
     @mock.patch('os.path.expanduser', new=lambda text: text)
     @mock.patch('os.path.isdir', new=lambda text: True)
@@ -149,7 +149,7 @@ def test_match_returns_dirs_when_dirs_exist(self):
         self.assertEqual(sorted(self.completer.matches(2, '"x')),
                          ['aaaaa/', 'abcde/'])
 
-    @mock.patch('glob.glob',
+    @mock.patch('glob.iglob',
                 new=lambda text: ['/expand/ed/abcde', '/expand/ed/aaaaa'])
     @mock.patch('os.path.expanduser',
                 new=lambda text: text.replace('~', '/expand/ed'))
