Changeset 29052 in vbox for trunk/src/VBox

Timestamp:

May 5, 2010 2:59:23 AM (15 years ago)

Author:

vboxsync

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

61101

Message:

VBoxShell: replaces with None in tuples returned with nat's commannds.

File:

• trunk/src/VBox/Frontends/VBoxShell/vboxshell.py (modified) (9 diffs)

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

@@ -2208 +2208 @@
                     print 'Invalid alias mode: ' + args[a]
                     print natAlias.__doc__
-                    return (1, '')
+                    return (1, None)
                 nat.aliasMode = int(nat.aliasMode) | alias[args[a]];
-    return (0, '')
+    return (0, None)
 
 def natSettings(ctx, mach, nicnum, nat, args):
@@ -2231 +2231 @@
         if args[1] < 16000:
             print 'invalid mtu value ({0} no in range [65 - 16000])'.format(args[1])
-            return (1, '')
+            return (1, None)
         for i in range(2, len(args)):
             if not args[i].isdigit() or int(args[i]) < 8 or int(args[i]) > 1024:
                 print 'invalid {0} parameter ({1} not in range [8-1024])'.format(i, args[i])
-                return (1,'') 
+                return (1, None) 
         a = [args[1]]
         if len(args) < 6:
@@ -2244 +2244 @@
         #print a
         nat.setNetworkSettings(int(a[0]), int(a[1]), int(a[2]), int(a[3]), int(a[4]))
-    return (0,'')
+    return (0, None)
 
 def natDns(ctx, mach, nicnum, nat, args):
@@ -2261 +2261 @@
         nat.dnsProxy =  'proxy' in args
         nat.dnsUseHostResolver =  'usehostresolver' in args
-    return (0, '')
+    return (0, None)
 
 def natTftp(ctx, mach, nicnum, nat, args):
@@ -2295 +2295 @@
             print 'invalid args:', args
             print natTftp.__doc__
-            return (1,'')
+            return (1, None)
         if cmd == 'prefix': nat.tftpPrefix = args[2]
         elif cmd == 'bootfile': nat.tftpBootFile = args[2]
@@ -2301 +2301 @@
         else:
             print "invalid cmd:", cmd
-            return (1, '')
-    return (0,'')
+            return (1, None)
+    return (0, None)
 
 def natPortForwarding(ctx, mach, nicnum, nat, args):
@@ -2345 +2345 @@
             print 'invalid port-forwarding or args of sub command ', args[1]
             print natPortForwarding.__doc__
-            return (1, '')
+            return (1, None)
 
         a = pfcmd[args[1]]['func']()
-    return (0,'')
+    return (0, None)
 
 def natNetwork(ctx, mach, nicnum, nat, args):
@@ -2364 +2364 @@
         if addr.count('.') > 3 or int(mask) < 0 or int(mask) > 32:
             print 'Invalid arguments'
-            return (1,'')
+            return (1, None)
         nat.network = args[1]
-    return (0, '')
+    return (0, None)
 def natCmd(ctx, args):
     """This command is entry point to NAT settins management
@@ -2422 +2422 @@
             mach.saveSettings()
         session.close()
-    else:
+    elif report is not None:
         for r in report:
             msg ='{0} nic{1} {2}: {3}'.format(mach.name, nicnum, func, r)