Changeset 21956 in vbox

Timestamp:

Aug 4, 2009 1:37:40 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

50653

Message:

Python: spaces cleanup, fixed typo in callback names

Location:

trunk/src/VBox

Files:

• Frontends/VBoxShell/vboxshell.py (modified) (14 diffs)
• Main/glue/vboxapi.py (modified) (9 diffs)

trunk/src/VBox/Frontends/VBoxShell/vboxshell.py

@@ -32 +32 @@
 import time
 
-# Simple implementation of IConsoleCallback, one can use it as skeleton 
+# Simple implementation of IConsoleCallback, one can use it as skeleton
 # for custom implementations
 class GuestMonitor:
@@ -39 +39 @@
 
     def onMousePointerShapeChange(self, visible, alpha, xHot, yHot, width, height, shape):
-        print  "%s: onMousePointerShapeChange: visible=%d" %(self.mach.name, visible) 
+        print  "%s: onMousePointerShapeChange: visible=%d" %(self.mach.name, visible)
     def onMouseCapabilityChange(self, supportsAbsolute, needsHostCursor):
         print  "%s: onMouseCapabilityChange: needsHostCursor=%d" %(self.mach.name, needsHostCursor)
@@ -102 +102 @@
     def onMachineDataChange(self,id):
         print "onMachineDataChange: %s" %(id)
-    
+
     def onExtraDataCanChange(self, id, key, value):
         print "onExtraDataCanChange: %s %s=>%s" %(id, key, value)
@@ -110 +110 @@
         print "onExtraDataChange: %s %s=>%s" %(id, key, value)
 
-    def onMediaRegistred(self, id, type, registred):
-        print "onMediaRegistred: %s" %(id)
-
-    def onMachineRegistred(self, id, registred):
-        print "onMachineRegistred: %s" %(id)
+    def onMediaRegistered(self, id, type, registered):
+        print "onMediaRegistered: %s" %(id)
+
+    def onMachineRegistered(self, id, registred):
+        print "onMachineRegistered: %s" %(id)
 
     def onSessionStateChange(self, id, state):
@@ -309 +309 @@
     # We need to catch all exceptions here, otherwise callback will never be unregistered
     except:
-        pass    
+        pass
     console.unregisterCallback(cb)
 
@@ -350 +350 @@
         print 'Trying to use local only functionality, ignored'
         return
-    console=session.console    
+    console=session.console
     ops={'pause':           lambda: console.pause(),
          'resume':          lambda: console.resume(),
@@ -637 +637 @@
         aliases[args[1]] = args[2]
         return 0
-    
+
     for (k,v) in aliases.items():
         print "'%s' is an alias for '%s'" %(k,v)
@@ -677 +677 @@
        print "3D acceleration NOT available"
 
-   print "Network interfaces:" 
+   print "Network interfaces:"
    for ni in ctx['global'].getArray(host, 'networkInterfaces'):
        print "  %s (%s)" %(ni.name, ni.IPAddress)
 
-   print "DVD drives:" 
+   print "DVD drives:"
    for dd in ctx['global'].getArray(host, 'DVDDrives'):
        print "  %s - %s" %(dd.name, dd.description)
 
-   print "USB devices:" 
+   print "USB devices:"
    for ud in ctx['global'].getArray(host, 'USBDevices'):
        print "  %s (vendorId=%d productId=%d serial=%s) %s" %(ud.product, ud.vendorId, ud.productId, ud.serialNumber, getUSBStateString(ud.state))
@@ -729 +729 @@
         return None
     else:
-        raise Exception("Unknown adapter type: "+type)    
-    
+        raise Exception("Unknown adapter type: "+type)
+
 
 def portForwardCmd(ctx, args):
@@ -752 +752 @@
     config = "VBoxInternal/Devices/" + adapterType + "/"
     config = config + str(adapter.slot)  +"/LUN#0/Config/" + profile_name
-  
+
     mach.setExtraData(config + "/Protocol", proto)
     mach.setExtraData(config + "/HostPort", str(hostPort))
@@ -759 +759 @@
     mach.saveSettings()
     session.close()
-   
+
     return 0
 
@@ -996 +996 @@
 # This file also will be read automatically on startup or 'reloadExt'.
 #
-# Also one can put shell extensions into ~/.VirtualBox/shexts and 
+# Also one can put shell extensions into ~/.VirtualBox/shexts and
 # they will also be picked up, so this way one can exchange
 # shell extensions easily.
@@ -1025 +1025 @@
         addExtsFromFile(ctx, cmds, os.path.join(shextdir,e))
 
-def interpret(ctx):    
+def interpret(ctx):
     if ctx['remote']:
         commands['connect'] = ["Connect to remote VBox instance", connectCmd, 0]
         commands['disconnect'] = ["Disconnect from remote VBox instance", disconnectCmd, 0]
-    
+
     vbox = ctx['vb']
 
@@ -1102 +1102 @@
     ctx = {'global':g_virtualBoxManager,
            'mgr':g_virtualBoxManager.mgr,
-           'vb':g_virtualBoxManager.vbox, 
+           'vb':g_virtualBoxManager.vbox,
            'ifaces':g_virtualBoxManager.constants,
-           'remote':g_virtualBoxManager.remote, 
+           'remote':g_virtualBoxManager.remote,
            'type':g_virtualBoxManager.type,
            'run': lambda cmd,args: runCommandCb(ctx, cmd, args),
-           'machById': lambda id: machById(ctx,id), 
+           'machById': lambda id: machById(ctx,id),
            'progressBar': lambda p: progressBar(ctx,p),
            '_machlist':None

trunk/src/VBox/Main/glue/vboxapi.py

@@ -82 +82 @@
         'values_as_string': pre-processed values ready for 'print' statement
         """
-        # Get around the problem with input arrays returned in output 
+        # Get around the problem with input arrays returned in output
         # parameters (see #3953) for MSCOM.
         if self.isMscom:
@@ -108 +108 @@
 
 def ComifyName(name):
-    return name[0].capitalize()+name[1:]    
+    return name[0].capitalize()+name[1:]
 
 _COMForward = { 'getattr' : None,
                 'setattr' : None}
-          
+
 def CustomGetAttr(self, attr):
     # fastpath
@@ -197 +197 @@
     VBOX_TLB_MAJOR = 1
     VBOX_TLB_MINOR = 0
-    
+
     def __init__(self, params):
             from win32com import universal
@@ -214 +214 @@
             self.handles.append(handle)
             _COMForward['getattr'] = DispatchBaseClass.__dict__['__getattr__']
-            DispatchBaseClass.__dict__['__getattr__'] = CustomGetAttr            
+            DispatchBaseClass.__dict__['__getattr__'] = CustomGetAttr
             _COMForward['setattr'] = DispatchBaseClass.__dict__['__setattr__']
-            DispatchBaseClass.__dict__['__setattr__'] = CustomSetAttr            
+            DispatchBaseClass.__dict__['__setattr__'] = CustomSetAttr
             win32com.client.gencache.EnsureDispatch('VirtualBox.Session')
             win32com.client.gencache.EnsureDispatch('VirtualBox.VirtualBox')
@@ -257 +257 @@
         str = ""
         str += "import win32com.server.util\n"
-        #str += "import win32com.server.register\n"
-        #str += "from win32com import universal\n"
         str += "import pythoncom\n"
-        #str += "universal.RegisterInterfaces(tlb_guid, 0, 1, 0, ['"+iface+"'])\n"
 
         str += "class "+iface+"Impl(BaseClass):\n"
@@ -266 +263 @@
         str += "   _typelib_guid_ = tlb_guid\n"
         str += "   _typelib_version_ = 1, 0\n"
-        #str += "   _reg_clsctx_ = pythoncom.CLSCTX_LOCAL_SERVER\n"
-        #str += "   _reg_clsid_ = '{F21202A2-959A-4149-B1C3-68B9013F3335}'\n"
-        #str += "   _reg_progid_ = 'VirtualBox."+iface+"Impl'\n"
-        #str += "   _reg_desc_ = 'Generated callback implementation class'\n"
-        #str += "   _reg_policy_spec_ = 'win32com.server.policy.EventHandlerPolicy'\n"
 
         # generate capitalized version of callbacks - that's how Python COM
         # looks them up on Windows
         for m in dir(impl):
-           if m.startswith("on"):      
+           if m.startswith("on"):
              str += "   "+ComifyName(m)+"=BaseClass."+m+"\n"
 
         str += "   def __init__(self): BaseClass.__init__(self, arg)\n"
-        #str += "win32com.server.register.UseCommandLine("+iface+"Impl)\n"
-
         str += "result = win32com.server.util.wrap("+iface+"Impl())\n"
         exec (str,d,d)
@@ -388 +378 @@
             self.password = ""
             self.url = None
-        self.vbox = None        
-
-    def getSessionObject(self, vbox):        
+        self.vbox = None
+
+    def getSessionObject(self, vbox):
         return self.wsmgr.getSessionObject(vbox)
 
@@ -466 +456 @@
             else:
                 style = "XPCOM"
-        
+
         exec "self.platform = Platform"+style+"(platparams)"
-            
+
         self.constants = VirtualBoxReflectionInfo()
         self.type = self.platform.getType()
         self.remote = self.platform.getRemote()
-        self.style = style 
+        self.style = style
         self.mgr = SessionManager(self)
-        
+
         try:
             self.vbox = self.platform.getVirtualBox()
@@ -527 +517 @@
 
     def getPerfCollector(self, vbox):
-        return PerfCollector(self, vbox)       
+        return PerfCollector(self, vbox)