launchpad-reviewers team mailing list archive

[Gavin Panella <gavin.panella@xxxxxxxxxxxxx>]

Gavin Panella has proposed merging lp:~allenap/maas/main-lint into lp:maas.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~allenap/maas/main-lint/+merge/122308
-- 
https://code.launchpad.net/~allenap/maas/main-lint/+merge/122308
Your team MAAS Maintainers is requested to review the proposed merge of lp:~allenap/maas/main-lint into lp:maas.

=== modified file 'src/maasserver/tests/test_commands_config_master_dhcp.py'
--- src/maasserver/tests/test_commands_config_master_dhcp.py	2012-08-24 10:28:16 +0000
+++ src/maasserver/tests/test_commands_config_master_dhcp.py	2012-08-31 15:49:19 +0000
@@ -15,7 +15,6 @@
 from optparse import OptionValueError
 
 from django.core.management import call_command
-from mock import Mock
 from maasserver.management.commands.config_master_dhcp import name_option
 from maasserver.models import (
     Config,
@@ -23,6 +22,7 @@
     )
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import TestCase
+from mock import Mock
 from provisioningserver import tasks
 from testtools.matchers import MatchesStructure
 

=== modified file 'src/maasserver/utils/tests/test_jsenums.py'
--- src/maasserver/utils/tests/test_jsenums.py	2012-06-26 16:31:54 +0000
+++ src/maasserver/utils/tests/test_jsenums.py	2012-08-31 15:49:19 +0000
@@ -14,6 +14,7 @@
 
 from inspect import getsourcefile
 
+from maasserver.utils import map_enum
 from maasserver.utils.jsenums import (
     dump,
     footer,
@@ -21,7 +22,6 @@
     header,
     serialize_enum,
     )
-from maasserver.utils import map_enum
 from maastesting.testcase import TestCase
 
 

=== modified file 'src/provisioningserver/__main__.py'
--- src/provisioningserver/__main__.py	2012-08-31 10:13:21 +0000
+++ src/provisioningserver/__main__.py	2012-08-31 15:49:19 +0000
@@ -15,7 +15,10 @@
 import provisioningserver.dhcp.writer
 import provisioningserver.pxe.install_bootloader
 import provisioningserver.pxe.install_image
-from provisioningserver.utils import AtomicWriteScript, MainScript
+from provisioningserver.utils import (
+    AtomicWriteScript,
+    MainScript,
+    )
 
 
 main = MainScript(__doc__)

=== modified file 'src/provisioningserver/dhcp/tests/test_writer.py'
--- src/provisioningserver/dhcp/tests/test_writer.py	2012-08-20 06:05:08 +0000
+++ src/provisioningserver/dhcp/tests/test_writer.py	2012-08-31 15:49:19 +0000
@@ -15,7 +15,10 @@
 from argparse import ArgumentParser
 from io import BytesIO
 import os
-from subprocess import Popen, PIPE
+from subprocess import (
+    PIPE,
+    Popen,
+    )
 import sys
 
 from maastesting.matchers import ContainsAll

=== modified file 'src/provisioningserver/tests/test_omshell.py'
--- src/provisioningserver/tests/test_omshell.py	2012-07-30 23:34:57 +0000
+++ src/provisioningserver/tests/test_omshell.py	2012-08-31 15:49:19 +0000
@@ -12,12 +12,12 @@
 __metaclass__ = type
 __all__ = []
 
-from fixtures import TempDir
 import os
 from subprocess import CalledProcessError
 import tempfile
 from textwrap import dedent
 
+from fixtures import TempDir
 from maastesting.factory import factory
 from maastesting.fakemethod import FakeMethod
 from maastesting.testcase import TestCase

=== modified file 'src/provisioningserver/tests/test_utils.py'
--- src/provisioningserver/tests/test_utils.py	2012-08-31 10:28:56 +0000
+++ src/provisioningserver/tests/test_utils.py	2012-08-31 15:49:19 +0000
@@ -36,8 +36,8 @@
 import provisioningserver
 from provisioningserver.utils import (
     ActionScript,
+    atomic_write,
     AtomicWriteScript,
-    atomic_write,
     get_mtime,
     incremental_write,
     MainScript,

=== modified file 'src/provisioningserver/utils.py'
--- src/provisioningserver/utils.py	2012-08-31 10:28:56 +0000
+++ src/provisioningserver/utils.py	2012-08-31 15:49:19 +0000
@@ -306,7 +306,7 @@
 
 class AtomicWriteScript:
     """Wrap the atomic_write function turning it into an ActionScript.
-    
+
     To use:
     >>> main = MainScript(atomic_write.__doc__)
     >>> main.register("myscriptname", AtomicWriteScript)