Patch correct function

sebastinas · sebastinas · commit 45fb40dc0bf2 · 2015-02-25T16:10:29.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/test/test_autocomplete.py b/bpython/test/test_autocomplete.py
@@ -3,7 +3,7 @@
 from collections import namedtuple
 import inspect
 import keyword
-from bpython._py3compat import py3
+import sys
 
 try:
     import unittest2 as unittest
@@ -17,8 +17,14 @@
     has_jedi = False
 
 from bpython import autocomplete
+from bpython._py3compat import py3
 from bpython.test import mock
 
+if sys.version_info[:2] >= (3, 4):
+    glob_function = 'glob.iglob'
+else:
+    glob_function = 'glob.glob'
+
 
 class TestSafeEval(unittest.TestCase):
     def test_catches_syntax_error(self):
@@ -123,33 +129,31 @@ 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.iglob', new=lambda text: [])
+    @mock.patch(glob_function, new=lambda text: [])
     def test_match_returns_none_if_not_in_string(self):
         self.assertEqual(self.completer.matches(2, 'abcd'), None)
 
-    @mock.patch('glob.iglob', new=lambda text: [])
+    @mock.patch(glob_function, new=lambda text: [])
     def test_match_returns_empty_list_when_no_files(self):
         self.assertEqual(self.completer.matches(2, '"a'), set())
 
-    @mock.patch('glob.iglob',
-                new=lambda text: ['abcde', 'aaaaa'])
+    @mock.patch(glob_function, new=lambda text: ['abcde', 'aaaaa'])
     @mock.patch('os.path.expanduser', new=lambda text: text)
     @mock.patch('os.path.isdir', new=lambda text: False)
     @mock.patch('os.path.sep', new='/')
     def test_match_returns_files_when_files_exist(self):
         self.assertEqual(sorted(self.completer.matches(2, '"x')),
                          ['aaaaa', 'abcde'])
 
-    @mock.patch('glob.iglob',
-                new=lambda text: ['abcde', 'aaaaa'])
+    @mock.patch(glob_function, new=lambda text: ['abcde', 'aaaaa'])
     @mock.patch('os.path.expanduser', new=lambda text: text)
     @mock.patch('os.path.isdir', new=lambda text: True)
     @mock.patch('os.path.sep', new='/')
     def test_match_returns_dirs_when_dirs_exist(self):
         self.assertEqual(sorted(self.completer.matches(2, '"x')),
                          ['aaaaa/', 'abcde/'])
 
-    @mock.patch('glob.iglob',
+    @mock.patch(glob_function,
                 new=lambda text: ['/expand/ed/abcde', '/expand/ed/aaaaa'])
     @mock.patch('os.path.expanduser',
                 new=lambda text: text.replace('~', '/expand/ed'))
