Fixed a few issues introduced while porting the shell completion code from default branch. 6_1_x

Sun, 13 Mar 2016 12:48:53 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 13 Mar 2016 12:48:53 +0100
branch
6_1_x
changeset 4848
36b1d9bec8f6
parent 4844
fcb19b666d96
child 4849
4eb0fba3b6c5

Fixed a few issues introduced while porting the shell completion code from default branch.

DebugClients/Python/DebugClientBase.py file | annotate | diff | comparison | revisions
DebugClients/Python/FlexCompleter.py file | annotate | diff | comparison | revisions
DebugClients/Python3/DebugClientBase.py file | annotate | diff | comparison | revisions
--- a/DebugClients/Python/DebugClientBase.py	Sat Mar 12 15:44:24 2016 +0100
+++ b/DebugClients/Python/DebugClientBase.py	Sun Mar 13 12:48:53 2016 +0100
@@ -1922,13 +1922,14 @@
         state = 0
         try:
             comp = completer(text, state)
+        except Exception:
             comp = None
         while comp is not None:
             completions.add(comp)
             state += 1
             try:
                 comp = completer(text, state)
-            except:
+            except Exception:
                 comp = None
 
     def startDebugger(self, filename=None, host=None, port=None,
--- a/DebugClients/Python/FlexCompleter.py	Sat Mar 12 15:44:24 2016 +0100
+++ b/DebugClients/Python/FlexCompleter.py	Sun Mar 13 12:48:53 2016 +0100
@@ -245,6 +245,7 @@
                     word = self._callable_postfix(
                         val, "%s.%s" % (expr, word))
                     matches.append(word)
+            except Exception:
                 # some badly behaved objects pollute dir() with non-strings,
                 # which cause the completion to fail.  This way we skip the
                 # bad entries and can still continue processing the others.
--- a/DebugClients/Python3/DebugClientBase.py	Sat Mar 12 15:44:24 2016 +0100
+++ b/DebugClients/Python3/DebugClientBase.py	Sun Mar 13 12:48:53 2016 +0100
@@ -1972,13 +1972,14 @@
         state = 0
         try:
             comp = completer(text, state)
+        except Exception:
             comp = None
         while comp is not None:
             completions.add(comp)
             state += 1
             try:
                 comp = completer(text, state)
-            except:
+            except Exception:
                 comp = None
 
     def startDebugger(self, filename=None, host=None, port=None,

eric ide

mercurial