launchpad-reviewers team mailing list archive

[Gavin Panella <gavin.panella@xxxxxxxxxxxxx>]

Gavin Panella has proposed merging lp:~allenap/maas/move-things-out-of-maas into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~allenap/maas/move-things-out-of-maas/+merge/112163
-- 
https://code.launchpad.net/~allenap/maas/move-things-out-of-maas/+merge/112163
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~allenap/maas/move-things-out-of-maas into lp:maas.

=== removed directory 'src/maas/utils'
=== removed file 'src/maas/utils/__init__.py'
=== added directory 'src/maasserver/utils'
=== renamed file 'src/maasserver/utils.py' => 'src/maasserver/utils/__init__.py'
=== renamed file 'src/maas/utils/jsenums.py' => 'src/maasserver/utils/jsenums.py'
=== renamed directory 'src/maas/utils/tests' => 'src/maasserver/utils/tests'
=== modified file 'src/maasserver/utils/tests/test_jsenums.py'
--- src/maas/utils/tests/test_jsenums.py	2012-05-09 13:03:02 +0000
+++ src/maasserver/utils/tests/test_jsenums.py	2012-06-26 16:38:25 +0000
@@ -1,7 +1,7 @@
 # Copyright 2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Tests for `maas.utils.jsenums`."""
+"""Tests for `maasserver.utils.jsenums`."""
 
 from __future__ import (
     absolute_import,
@@ -14,7 +14,7 @@
 
 from inspect import getsourcefile
 
-from maas.utils.jsenums import (
+from maasserver.utils.jsenums import (
     dump,
     footer,
     get_enums,

=== renamed file 'src/maasserver/tests/test_utils.py' => 'src/maasserver/utils/tests/test_utils.py'
=== renamed file 'src/maas/tests/test_maas_import_pxe_files.py' => 'src/provisioningserver/tests/test_maas_import_pxe_files.py'
--- src/maas/tests/test_maas_import_pxe_files.py	2012-06-25 09:03:14 +0000
+++ src/provisioningserver/tests/test_maas_import_pxe_files.py	2012-06-26 16:38:25 +0000
@@ -90,18 +90,18 @@
         to download from the Ubuntu server and store into the system's real
         TFTP root directory, respectively.  Both bad ideas.
         """
-        script = './scripts/maas-import-pxe-files'
-        path = ':'.join([
-            os.path.join(
-                os.path.dirname(__file__), os.path.pardir, os.path.pardir,
-                os.path.pardir, 'bin'),
-            os.environ['PATH'],
-            ])
+        # TODO: Use path.py <http://pypi.python.org/pypi/path.py> instead, or
+        # something similar; this is tedious stuff.
+        here = os.path.dirname(__file__)
+        root = os.path.join(here, os.pardir, os.pardir, os.pardir)
+        script = os.path.join(root, "scripts", "maas-import-pxe-files")
+        path = [os.path.join(root, "bin")]
+        path.extend(os.environ.get("PATH", "").split(os.pathsep))
         env = {
             'ARCHIVE': 'file://%s' % archive_dir,
             # Substitute curl for wget; it accepts file:// URLs.
             'DOWNLOAD': 'curl -O --silent',
-            'PATH': path,
+            'PATH': os.pathsep.join(path),
             'TFTPROOT': tftproot,
         }
         if arch is not None: