Merge lp:~milo/linaro-image-tools/pep8-fixes into lp:linaro-image-tools/11.11

[Milo Casagrande]

Some PEP8 fixes.

[Georgy Redkozubov (gesha)]

Looks good

review: Approve

[lp:~milo/linaro-image-tools/pep8-fixes]

626. By Milo Casagrande on 2013-06-27

PEP8 fixes.

=== modified file 'linaro_image_tools/hwpack/tests/test_config.py'
--- linaro_image_tools/hwpack/tests/test_config.py	2013-02-18 09:40:15 +0000
+++ linaro_image_tools/hwpack/tests/test_config.py	2013-06-27 09:08:30 +0000
@@ -304,9 +304,9 @@
     def test_validate_partition_layout(self):
         partition_layout = 'apafs_bananfs'
         config = self.get_config(self.valid_start_v2 + "u_boot_package = "
-                                     "u-boot-linaro-s5pv310\nu_boot_file = "
-                                     "u-boot.bin\npartition_layout = %s\n" %
-                                     partition_layout)
+                                 "u-boot-linaro-s5pv310\nu_boot_file = "
+                                 "u-boot.bin\npartition_layout = %s\n" %
+                                 partition_layout)
         self.assertValidationError(
             "Undefined partition layout %s in the [%s] section. "
             "Valid partition layouts are %s."
 
=== modified file 'linaro_image_tools/hwpack/tests/test_hardwarepack.py'
--- linaro_image_tools/hwpack/tests/test_hardwarepack.py	2013-02-17 13:53:41 +0000
+++ linaro_image_tools/hwpack/tests/test_hardwarepack.py	2013-06-27 09:08:30 +0000
@@ -443,7 +443,7 @@
         self.assertThat(
             tf,
             HardwarePackHasFile("pkgs/%s" % package1.filename,
-            content=package1.content.read()))
+                                content=package1.content.read()))
         self.assertThat(
             tf,
             HardwarePackHasFile("pkgs/%s" % package2.filename,
 
=== modified file 'linaro_image_tools/media_create/boards.py'
--- linaro_image_tools/media_create/boards.py	2013-05-23 17:29:29 +0000
+++ linaro_image_tools/media_create/boards.py	2013-06-27 09:08:30 +0000
@@ -1169,7 +1169,7 @@
         self.delete_file(toc_filename)
         if self.delete_startupfiles:
             self.delete_file(os.path.join(config_files_dir,
-                                         self.snowball_startup_files_config))
+                                          self.snowball_startup_files_config))
 
     def snowball_config(self, chroot_dir):
         # We will find the startupfiles in the target boot partition.
 
=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2013-05-23 17:57:10 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2013-06-27 09:08:30 +0000
@@ -2987,7 +2987,7 @@
         self.linux_offsets_and_sizes = [
             (16384 * SECTOR_SIZE, 15746 * SECTOR_SIZE),
             (32768 * SECTOR_SIZE, (self.linux_image_size -
-                                        32768 * SECTOR_SIZE))
+                                   32768 * SECTOR_SIZE))
         ]
         self.android_image_size = 256 * 1024 ** 2
         # Extended partition info takes 32 sectors from the first ext partition
 
=== modified file 'linaro_image_tools/tests/test_utils.py'
--- linaro_image_tools/tests/test_utils.py	2013-02-25 18:31:26 +0000
+++ linaro_image_tools/tests/test_utils.py	2013-06-27 09:08:30 +0000
@@ -280,7 +280,7 @@
         else:
             self.assertEqual(
                 ['apt-get -s install dosfstools',
-                '%s apt-get --yes install dosfstools' % sudo_args],
+                 '%s apt-get --yes install dosfstools' % sudo_args],
                 fixture.mock.commands_executed)
 
     def test_package_installation_refused(self):