launchpad-reviewers team mailing list archive

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

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/doris-really-hungry into lp:maas.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~jtv/maas/doris-really-hungry/+merge/121383

Okay, Doris, you get one more bite of lint.  But after that Gavin has to feed you, alright?  I don't want any trouble with him.


Jeroen
-- 
https://code.launchpad.net/~jtv/maas/doris-really-hungry/+merge/121383
Your team MAAS Maintainers is requested to review the proposed merge of lp:~jtv/maas/doris-really-hungry into lp:maas.

=== modified file 'src/provisioningserver/dhcp/leases_parser.py'
--- src/provisioningserver/dhcp/leases_parser.py	2012-08-27 07:20:29 +0000
+++ src/provisioningserver/dhcp/leases_parser.py	2012-08-27 09:05:24 +0000
@@ -55,7 +55,8 @@
         caseless=True) + args
     )
 
-lease_statement = (hardware | ends | set_statement | other_statement) + Suppress(';')
+lease_statement = (
+    hardware | ends | set_statement | other_statement) + Suppress(';')
 lease_parser = (
     CaselessKeyword("lease") + ip("ip") +
     Suppress('{') +

=== modified file 'src/provisioningserver/dhcp/tests/test_leases.py'
--- src/provisioningserver/dhcp/tests/test_leases.py	2012-08-27 07:12:44 +0000
+++ src/provisioningserver/dhcp/tests/test_leases.py	2012-08-27 09:05:24 +0000
@@ -17,7 +17,6 @@
     timedelta,
     )
 import json
-from mock import Mock
 from textwrap import dedent
 
 from apiclient.maas_client import MAASClient
@@ -27,6 +26,7 @@
     age_file,
     get_write_time,
     )
+from mock import Mock
 from provisioningserver import cache
 from provisioningserver.auth import (
     MAAS_URL_CACHE_KEY,
@@ -336,4 +336,3 @@
         leases = kwargs['leases']
         decoded = json.loads(leases)
         self.assertIsInstance(decoded, dict)
-