Merge lp:~ewindisch/nova/lp733609 into lp:~hudson-openstack/nova/trunk

[Erica Windisch]

Removes excess commas and parens. Fixes bug 733609.

[Soren Hansen (soren)]

Once again, I'm at a complete loss as to what the motivation is. I strongly prefer always passing a tuple or a dict when doing string interpolation. Less ambiguity ftw.

Can you explain why you believe that this has any relation to the linked bug at all?

review: Disapprove

[Rick Harris (rconradharris)]

Hi Eric,

Seeing that https://bugs.launchpad.net/nova/+bug/733609 is now 'Fixed Committed' from another mergeprop, I'm going to agree with Soren here and vote we abandon this mergeprop.

That said, really appreciate the patch submission here, keep them a comin' :-)

review: Disapprove

Unmerged revisions

795. By Erica Windisch on 2011-03-12

Remove excess parens/commas

=== modified file 'nova/network/linux_net.py'
--- nova/network/linux_net.py	2011-03-11 02:44:01 +0000
+++ nova/network/linux_net.py	2011-03-12 02:19:50 +0000
@@ -291,13 +291,13 @@
             for cmd, tables in s:
                 for table in tables:
                     current_table, _ = self.execute('sudo',
-                                                    '%s-save' % (cmd,),
-                                                    '-t', '%s' % (table,),
+                                                    '%s-save' % cmd,
+                                                    '-t', table,
                                                     attempts=5)
                     current_lines = current_table.split('\n')
                     new_filter = self._modify_rules(current_lines,
                                                     tables[table])
-                    self.execute('sudo', '%s-restore' % (cmd,),
+                    self.execute('sudo', '%s-restore' % cmd,
                                  process_input='\n'.join(new_filter),
                                  attempts=5)