launchpad-reviewers team mailing list archive

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

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/seriously-doris-we-need-to-talk into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jtv/maas/seriously-doris-we-need-to-talk/+merge/98577

I had to get a little creative about breaking up the URL; I think the way I did it is ad-hoc but at least it's clear, and in a case like this we probably need clarity more than we do convenience when following the link.
-- 
https://code.launchpad.net/~jtv/maas/seriously-doris-we-need-to-talk/+merge/98577
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/maas/seriously-doris-we-need-to-talk into lp:maas.

=== modified file 'src/maasserver/tests/test_zeroconfservice.py'
--- src/maasserver/tests/test_zeroconfservice.py	2012-03-20 21:23:17 +0000
+++ src/maasserver/tests/test_zeroconfservice.py	2012-03-21 05:49:21 +0000
@@ -16,9 +16,8 @@
 import subprocess
 import time
 
+from maasserver.zeroconfservice import ZeroconfService
 from maastesting.testcase import TestCase
-from maasserver.zeroconfservice import ZeroconfService
-
 
 # These tests will actually inject data in the system Avahi system.
 # Would be nice to isolate it from the system Avahi service, but I didn't
@@ -38,7 +37,7 @@
         browser = subprocess.Popen(
             ['avahi-browse', '-k', '-p', service_type],
             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        until = time.time() + timeout;
+        until = time.time() + timeout
         while time.time() < until:
             # Busy loop until there is some input on stdout,
             # or we give up.

=== modified file 'src/maasserver/urls.py'
--- src/maasserver/urls.py	2012-03-20 15:57:32 +0000
+++ src/maasserver/urls.py	2012-03-21 05:49:21 +0000
@@ -129,6 +129,9 @@
     (r'^api/1\.0/', include('maasserver.urls_api'))
     )
 
-# Code to run once when the server initialized,
-# as suggested in http://stackoverflow.com/questions/6791911/execute-code-when-django-starts-once-only
+# Code to run once when the server is initialized, as suggested in
+# http://stackoverflow.com/
+#   questions/
+#       6791911/
+#           execute-code-when-django-starts-once-only
 setup_maas_avahi_service()