From patchwork Wed Apr 3 15:11:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Milo Casagrande X-Patchwork-Id: 15877 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 4F9F923E39 for ; Wed, 3 Apr 2013 15:11:17 +0000 (UTC) Received: from mail-qe0-f72.google.com (mail-qe0-f72.google.com [209.85.128.72]) by fiordland.canonical.com (Postfix) with ESMTP id A65A9A187D5 for ; Wed, 3 Apr 2013 15:11:16 +0000 (UTC) Received: by mail-qe0-f72.google.com with SMTP id 1sf2693114qec.3 for ; Wed, 03 Apr 2013 08:11:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-beenthere:x-received:received-spf:x-received :x-forwarded-to:x-forwarded-for:delivered-to:x-received:received-spf :mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state:x-original-sender :x-original-authentication-results:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=H5uIe/oNK39qhBTMGezl1ovihrQggMRgzv/YaLZqVJo=; b=PsookiL+ePChZ0g06Hta+PYRxV0qCmj0E9354EA0RczwuHubMAUenw69doJ6xzf+dw Q4UlRSMrQW0lWD9mt+LEr/Et7yR3r01VHCKINoDl7XC2Dn9wGPzPZRaWSZN9x5DWu9sL /bhEAvFh2Rsg4Gi0Ev1YNRb1GxktIe23V4/scLwnPbTs+bY7JhbzRcvx3FoxkZNtgCtf or2QL2rrMzQqqzdTIbKBj98VOtUJNafhFlxttvXxvnpIdQPmtuTES7NUjkyNTwUuocgD eqJTHskxoMD0qEce9DipQLtYaFQNaXfg/9KAeG1cQ1vpaW9YgOBZwo8d9bP4SkSBRp2d kang== X-Received: by 10.224.72.199 with SMTP id n7mr1258792qaj.5.1365001876164; Wed, 03 Apr 2013 08:11:16 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.83.230 with SMTP id t6ls885826qey.17.gmail; Wed, 03 Apr 2013 08:11:15 -0700 (PDT) X-Received: by 10.52.29.70 with SMTP id i6mr1268327vdh.98.1365001875828; Wed, 03 Apr 2013 08:11:15 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id sx2si5109894vdc.110.2013.04.03.08.11.15 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Apr 2013 08:11:15 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id ia10so1562271vcb.36 for ; Wed, 03 Apr 2013 08:11:15 -0700 (PDT) X-Received: by 10.58.223.134 with SMTP id qu6mr1522131vec.35.1365001875625; Wed, 03 Apr 2013 08:11:15 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.59.4.204 with SMTP id cg12csp174677ved; Wed, 3 Apr 2013 08:11:15 -0700 (PDT) X-Received: by 10.195.12.133 with SMTP id eq5mr3408494wjd.52.1365001874366; Wed, 03 Apr 2013 08:11:14 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id gk17si2633825wic.46.2013.04.03.08.11.13 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 03 Apr 2013 08:11:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1UNPLF-00058z-I8 for ; Wed, 03 Apr 2013 15:11:13 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 3BA08E0028 for ; Wed, 3 Apr 2013 15:11:13 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: linaro-image-tools X-Launchpad-Branch: ~linaro-image-tools/linaro-image-tools/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 617 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 617: PEP8 fixes. Message-Id: <20130403151113.26327.18676.launchpad@ackee.canonical.com> Date: Wed, 03 Apr 2013 15:11:13 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16546"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: fe7a7229a8cae2f52a60f8348371919bd00daa83 X-Gm-Message-State: ALoCoQlFCmjPKkJ0C3J1BcB+VKTEnHo9g5MeLn1R4dsmhrSiy7/0/2RM05sjGmfU07ZvQVqetf8U X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Merge authors: James Tunnicliffe (dooferlad) Related merge proposals: https://code.launchpad.net/~dooferlad/linaro-image-tools/pep8-fixes/+merge/156810 proposed by: James Tunnicliffe (dooferlad) review: Approve - Milo Casagrande (milo) ------------------------------------------------------------ revno: 617 [merge] author: James Tunnicliffe committer: Milo Casagrande branch nick: trunk timestamp: Wed 2013-04-03 17:10:22 +0200 message: PEP8 fixes. modified: linaro_image_tools/media_create/android_boards.py linaro_image_tools/media_create/boards.py linaro_image_tools/media_create/tests/test_android_boards.py linaro_image_tools/media_create/tests/test_media_create.py --- lp:linaro-image-tools https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk You are subscribed to branch lp:linaro-image-tools. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk/+edit-subscription === modified file 'linaro_image_tools/media_create/android_boards.py' --- linaro_image_tools/media_create/android_boards.py 2013-03-26 08:59:38 +0000 +++ linaro_image_tools/media_create/android_boards.py 2013-04-03 11:32:40 +0000 @@ -508,9 +508,9 @@ self.initrd_addr = '0x41000000' self.dtb_addr = '0x41f00000' self.dtb_name = 'exynos5250-arndale.dtb' - self._android_specific_args = ('init=/init ' - 'androidboot.console=ttySAC2 console=ttySAC2 ' - 'initrd=%s' % self.initrd_addr) + self._android_specific_args = ( + 'init=/init androidboot.console=ttySAC2 console=ttySAC2 initrd=%s' + % self.initrd_addr) self._extra_serial_options = 'ttySAC2,115200n8' self._extra_boot_args_options = 'rootdelay=3' @@ -533,8 +533,8 @@ if d_img_data is not None: assert self.dtb_addr is not None, ( "Need a dtb_addr when passing d_img_data") - boot_script += (("%(fatload_command)s mmc %(mmc_option)s " - "%(dtb_addr)s ")) % replacements + boot_script += ("%(fatload_command)s mmc %(mmc_option)s " + "%(dtb_addr)s " % replacements) boot_script += "%s; " % d_img_data boot_script += (("bootm %(kernel_addr)s")) % replacements if i_img_data is not None: @@ -559,8 +559,8 @@ name = boot_bin['name'] file_path = os.path.join(chroot_dir, boot_partition, name) if not os.path.exists(file_path): - raise BoardException("File '%s' does not exists. Cannot " - "proceed." % name) + raise BoardException( + "File '%s' does not exists. Cannot proceed." % name) _dd(file_path, boot_device_or_file, seek=boot_bin['seek']) === modified file 'linaro_image_tools/media_create/boards.py' --- linaro_image_tools/media_create/boards.py 2013-03-26 09:08:58 +0000 +++ linaro_image_tools/media_create/boards.py 2013-04-03 11:32:40 +0000 @@ -533,8 +533,8 @@ if d_img_data is not None: assert self.dtb_addr is not None, ( "Need a dtb_addr when passing d_img_data") - boot_script += (("%(fatload_command)s mmc %(mmc_option)s " - "%(dtb_addr)s board.dtb; ")) % replacements + boot_script += ("%(fatload_command)s mmc %(mmc_option)s " + "%(dtb_addr)s board.dtb; " % replacements) boot_script += (("bootm %(kernel_addr)s")) % replacements if i_img_data is not None: boot_script += ((" %(initrd_addr)s")) % replacements @@ -1594,8 +1594,8 @@ name = boot_bin['name'] file_path = os.path.join(chroot_dir, boot_partition, name) if not os.path.exists(file_path): - raise BoardException("File '%s' does not exists. Cannot " - "proceed." % name) + raise BoardException( + "File '%s' does not exists. Cannot proceed." % name) _dd(file_path, boot_device_or_file, seek=boot_bin['seek']) === modified file 'linaro_image_tools/media_create/tests/test_android_boards.py' --- linaro_image_tools/media_create/tests/test_android_boards.py 2013-03-25 12:52:28 +0000 +++ linaro_image_tools/media_create/tests/test_android_boards.py 2013-04-03 11:32:40 +0000 @@ -489,10 +489,10 @@ 'init=/init androidboot.console=ttySAC2 ' 'console=ttySAC2 initrd=0x41000000', 'bootcmd': 'fatload mmc 0:1 0x40007000 uImage; fatload mmc 0:1 ' - '0x41000000 uInitrd; fatload mmc 0:1 0x41f00000 ' - 'exynos5250-arndale.dtb; bootm 0x40007000 0x41000000 ' - '0x41f00000', + '0x41000000 uInitrd; fatload mmc 0:1 0x41f00000 ' + 'exynos5250-arndale.dtb; bootm 0x40007000 0x41000000 ' + '0x41f00000', 'fdt_high': '0xffffffff', 'initrd_high': '0xffffffff', - } + } self.assertBootEnv(expected, board='arndale') === modified file 'linaro_image_tools/media_create/tests/test_media_create.py' --- linaro_image_tools/media_create/tests/test_media_create.py 2013-03-26 08:59:38 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2013-04-03 11:32:40 +0000 @@ -1519,8 +1519,8 @@ def test_origen_quad_raw(self): # Need to mock this since files do not exist here, and # an Exception is raised. - self.useFixture(MockSomethingFixture(os.path, 'exists', - lambda exists: True)) + self.useFixture( + MockSomethingFixture(os.path, 'exists', lambda exists: True)) self.populate_raw_partition(boards.OrigenQuadConfig()) expected = ['_dd', '_dd', '_dd', '_dd', '_dd'] @@ -1528,8 +1528,8 @@ def test_origen_quad_raises(self): board_conf = boards.OrigenQuadConfig() - self.assertRaises(boards.BoardException, - board_conf.populate_raw_partition, '', '') + self.assertRaises( + boards.BoardException, board_conf.populate_raw_partition, '', '') def test_arndale_raw(self): self.useFixture(MockSomethingFixture(os.path, 'getsize', @@ -1648,20 +1648,20 @@ fixture = MockCmdRunnerPopenFixture() self.useFixture(fixture) expected_commands = [ - ('sudo -E dd if=/dev/zero of= bs=512 conv=notrunc count=32 ' - 'seek=1601'), - ('sudo -E dd if=boot/origen_quad.bl1.bin of= bs=512 ' - 'conv=notrunc seek=1'), - ('sudo -E dd if=boot/origen_quad-spl.bin.signed of= bs=512 ' - 'conv=notrunc seek=31'), - ('sudo -E dd if=boot/u-boot.bin of= bs=512 conv=notrunc ' - 'seek=63'), - ('sudo -E dd if=boot/exynos4x12.tzsw.signed.img of= bs=512 ' - 'conv=notrunc seek=761') - ] + ('sudo -E dd if=/dev/zero of= bs=512 conv=notrunc count=32 ' + 'seek=1601'), + ('sudo -E dd if=boot/origen_quad.bl1.bin of= bs=512 ' + 'conv=notrunc seek=1'), + ('sudo -E dd if=boot/origen_quad-spl.bin.signed of= bs=512 ' + 'conv=notrunc seek=31'), + ('sudo -E dd if=boot/u-boot.bin of= bs=512 conv=notrunc ' + 'seek=63'), + ('sudo -E dd if=boot/exynos4x12.tzsw.signed.img of= bs=512 ' + 'conv=notrunc seek=761') + ] - self.useFixture(MockSomethingFixture(os.path, 'exists', - lambda exists: True)) + self.useFixture( + MockSomethingFixture(os.path, 'exists', lambda exists: True)) self.populate_raw_partition(android_boards.AndroidOrigenQuadConfig()) expected = []