launchpad-reviewers team mailing list archive

["Jeroen T. Vermeulen" <jtv@xxxxxxxxxxxxx>]

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/doris-samples-the-imports into lp:maas.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~jtv/maas/doris-samples-the-imports/+merge/124592
-- 
https://code.launchpad.net/~jtv/maas/doris-samples-the-imports/+merge/124592
Your team MAAS Maintainers is requested to review the proposed merge of lp:~jtv/maas/doris-samples-the-imports into lp:maas.

=== modified file 'src/maascli/lib/commandant/builtins.py'
--- src/maascli/lib/commandant/builtins.py	2012-09-12 15:26:07 +0000
+++ src/maascli/lib/commandant/builtins.py	2012-09-17 03:18:20 +0000
@@ -24,10 +24,12 @@
 import bzrlib
 from bzrlib.commands import Command
 from bzrlib.option import Option
-
 import commandant
-from commandant.help_topics import HelpTopic, CommandHelpTopic
 from commandant.formatting import print_columns
+from commandant.help_topics import (
+    CommandHelpTopic,
+    HelpTopic,
+    )
 
 
 class cmd_version(Command):

=== modified file 'src/maascli/lib/commandant/commands.py'
--- src/maascli/lib/commandant/commands.py	2012-09-12 15:26:07 +0000
+++ src/maascli/lib/commandant/commands.py	2012-09-17 03:18:20 +0000
@@ -20,10 +20,9 @@
 import os
 import sys
 
+from bzrlib.commands import Command
 from twisted.internet.defer import Deferred
 
-from bzrlib.commands import Command
-
 
 class ExecutableCommand(Command):
     """Specialized command runs an executable program."""

=== modified file 'src/maascli/lib/commandant/controller.py'
--- src/maascli/lib/commandant/controller.py	2012-09-12 15:26:07 +0000
+++ src/maascli/lib/commandant/controller.py	2012-09-17 03:18:20 +0000
@@ -23,9 +23,11 @@
 import sys
 import tempfile
 
+from bzrlib.commands import (
+    Command,
+    run_bzr,
+    )
 import bzrlib.ui
-from bzrlib.commands import run_bzr, Command
-
 from commandant import __version__
 from commandant.commands import ExecutableCommand
 from commandant.help_topics import FileHelpTopic

=== modified file 'src/maascli/lib/commandant/entry_point.py'
--- src/maascli/lib/commandant/entry_point.py	2012-09-12 15:26:07 +0000
+++ src/maascli/lib/commandant/entry_point.py	2012-09-17 03:18:20 +0000
@@ -18,8 +18,8 @@
 """Bootstrap code starts and runs Commandant."""
 
 from commandant import builtins
+from commandant.controller import CommandController
 from commandant.errors import UsageError
-from commandant.controller import CommandController
 
 
 def main(argv):

=== modified file 'src/provisioningserver/kernel_opts.py'
--- src/provisioningserver/kernel_opts.py	2012-09-14 18:53:19 +0000
+++ src/provisioningserver/kernel_opts.py	2012-09-17 03:18:20 +0000
@@ -19,7 +19,6 @@
 import os
 
 from provisioningserver.config import Config
-from provisioningserver.pxe.tftppath import compose_image_path
 from provisioningserver.utils import parse_key_value_file
 
 

=== modified file 'src/provisioningserver/tests/test_kernel_opts.py'
--- src/provisioningserver/tests/test_kernel_opts.py	2012-09-14 18:53:19 +0000
+++ src/provisioningserver/tests/test_kernel_opts.py	2012-09-17 03:18:20 +0000
@@ -28,8 +28,6 @@
     ISCSI_TARGET_NAME_PREFIX,
     KernelParameters,
     )
-
-from provisioningserver.pxe.tftppath import compose_image_path
 from provisioningserver.testing.config import ConfigFixture
 from testtools.matchers import (
     Contains,
@@ -135,12 +133,16 @@
         expected = ["console=tty1", "console=ttyS0", "nomodeset"]
 
         params = make_kernel_parameters({
-            "purpose": "commissioning", "arch": "i386" })
+            "purpose": "commissioning",
+            "arch": "i386",
+            })
         cmdline = compose_kernel_command_line_new(params)
         self.assertThat(cmdline, ContainsAll(expected))
 
         params = make_kernel_parameters({
-            "purpose": "install", "arch": "i386" })
+            "purpose": "install",
+            "arch": "i386",
+            })
         cmdline = compose_kernel_command_line_new(params)
         self.assertThat(cmdline, ContainsAll(expected))