[CalendarServer-changes] [8452] CalendarServer/trunk/calendarserver/tools/shell.py

[source_changes at macosforge.org]

Revision: 8452
          http://trac.macosforge.org/projects/calendarserver/changeset/8452
Author:   wsanchez at apple.com
Date:     2011-12-14 18:07:24 -0800 (Wed, 14 Dec 2011)
Log Message:
-----------
Complete at start of line

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/shell.py

Modified: CalendarServer/trunk/calendarserver/tools/shell.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/shell.py	2011-12-15 02:04:59 UTC (rev 8451)
+++ CalendarServer/trunk/calendarserver/tools/shell.py	2011-12-15 02:07:24 UTC (rev 8452)
@@ -214,25 +214,24 @@
 
         if tokens:
             cmd = tokens.pop(0)
+        else:
+            cmd = ""
 
-            if tokens:
-                # Completing arguments
+        if tokens:
+            # Completing arguments
 
-                m = getattr(self, "complete_%s" % (cmd,), None)
-                if not m:
-                    return
-                completions = m(tokens)
-            else:
-                # Completing command name
-
-                completions = set()
-                for name, m in self.commands():
-                    if name.startswith(cmd):
-                        completions.add(name)
+            m = getattr(self, "complete_%s" % (cmd,), None)
+            if not m:
+                return
+            completions = m(tokens)
         else:
-            # Completing command names
-            pass
+            # Completing command name
 
+            completions = set()
+            for name, m in self.commands():
+                if name.startswith(cmd):
+                    completions.add(name)
+
         log.msg("TAB: %r :: %r" % ("".join(self.lineBuffer), completions))
 
     def exit(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111214/5c068c06/attachment.html>