Be more careful with glob.glob (fixes bpython#491)

sebastinas · sebastinas · commit 846ca4dea9de · 2015-02-24T14:22:55.000+01:00
If we have glob.escape, use it.

Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -27,14 +27,15 @@
 
 import __main__
 import abc
+import glob
 import keyword
 import os
+import re
 import rlcompleter
+import sys
 from six.moves import range, builtins
 from six import string_types, iteritems
 
-from glob import glob
-
 from bpython import inspection
 from bpython import importcompletion
 from bpython import line as lineparts
@@ -160,6 +161,17 @@ class FilenameCompletion(BaseCompletionType):
     def __init__(self):
         super(FilenameCompletion, self).__init__(False)
 
+    if sys.version_info[:2] >= (3, 4):
+        def safe_glob(self, pathname):
+            return glob.glob(glob.escape(pathname) + '*')
+    else:
+        def safe_glob(self, pathname):
+            try:
+                return glob.glob(pathname + '*')
+            except re.error:
+                # see #491
+                return tuple()
+
     def matches(self, cursor_offset, line, **kwargs):
         cs = lineparts.current_string(cursor_offset, line)
         if cs is None:
@@ -168,7 +180,7 @@ def matches(self, cursor_offset, line, **kwargs):
         matches = set()
         username = text.split(os.path.sep, 1)[0]
         user_dir = os.path.expanduser(username)
-        for filename in glob(os.path.expanduser(text + '*')):
+        for filename in self.safe_glob(os.path.expanduser(text)):
             if os.path.isdir(filename):
                 filename += os.path.sep
             if text.startswith('~'):
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('bpython.autocomplete.glob', new=lambda text: [])
+    @mock.patch('glob.glob', new=lambda text: [])
     def test_match_returns_none_if_not_in_string(self):
         self.assertEqual(self.completer.matches(2, 'abcd'), None)
 
-    @mock.patch('bpython.autocomplete.glob', new=lambda text: [])
+    @mock.patch('glob.glob', new=lambda text: [])
     def test_match_returns_empty_list_when_no_files(self):
         self.assertEqual(self.completer.matches(2, '"a'), set())
 
-    @mock.patch('bpython.autocomplete.glob',
+    @mock.patch('glob.glob',
                 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('bpython.autocomplete.glob',
+    @mock.patch('glob.glob',
                 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('bpython.autocomplete.glob',
+    @mock.patch('glob.glob',
                 new=lambda text: ['/expand/ed/abcde', '/expand/ed/aaaaa'])
     @mock.patch('os.path.expanduser',
                 new=lambda text: text.replace('~', '/expand/ed'))
