Merge lp:~elopio/snapcraft/fix-pep8-and-doc-indentation into lp:~snappy-dev/snapcraft/core

[Leo Arias]

Fix markdown indentation, make pep8 and pyflakes3 happy.

[Sergio Schvezov (sergiusens)]

If we are going to do this, maybe also remove the pep8 exception

review: Needs Fixing

[Daniel Holbach (dholbach)]

Done.

[John Lenton (chipaca)]

LGTM :)

review: Approve

[Snappy Tarmac (snappydevtarmac)]

Attempt to merge into lp:snapcraft failed due to conflicts:

text conflict in snapcraft/cmds.py

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~dholbach/snapcraft/fix-pep8-and-doc-indentation into lp:snapcraft failed. Below is the output from the failed tests.

snapcraft/meta.py:115:49: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:116:49: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:118:49: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:119:49: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:149:37: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:150:37: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:156:37: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:157:37: E126 continuation line over-indented for hanging indent
snapcraft/meta.py:172:17: E126 continuation line over-indented for hanging indent
snapcraft/plugin.py:187:17: E126 continuation line over-indented for hanging indent
snapcraft/repo.py:31:80: E501 line too long (91 > 79 characters)
snapcraft/sources.py:68:21: E126 continuation line over-indented for hanging indent
snapcraft/yaml.py:157:25: E126 continuation line over-indented for hanging indent
snapcraft/tests/test_repo.py:34:80: E501 line too long (97 > 79 characters)
snapcraft/tests/test_repo.py:51:80: E501 line too long (99 > 79 characters)
snapcraft/tests/test_repo.py:34:80: E501 line too long (97 > 79 characters)
snapcraft/tests/test_repo.py:51:80: E501 line too long (99 > 79 characters)

[Daniel Holbach (dholbach)]

Could this be tarmac is using an old pep8?

review: Needs Information

[Daniel Holbach (dholbach)]

<dholbach> elopio, do you know which version of pep8 is running on the tarmac instance? (https://code.launchpad.net/~dholbach/snapcraft/fix-pep8-and-doc-indentation/+merge/273195)
<elopio> dholbach: let me check.
<elopio> dholbach: 1.4.6-1.1build1
<dholbach> ah, ok, so that's trusty's pep8...
<elopio> dholbach: yes, tarmac is trusty.

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~dholbach/snapcraft/fix-pep8-and-doc-indentation into lp:snapcraft failed. Below is the output from the failed tests.

snapcraft/common.py:81: undefined name 'decode'

[Leo Arias (elopio)]

Sorry for stealing your branch, but it had a small typo and we need to land this asap to avoid big conflicts. Approving again.

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~elopio/snapcraft/fix-pep8-and-doc-indentation into lp:snapcraft failed. Below is the output from the failed tests.

snapcraft/common.py:81:17: E126 continuation line over-indented for hanging indent

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~elopio/snapcraft/fix-pep8-and-doc-indentation into lp:snapcraft failed. Below is the output from the failed tests.

snapcraft/common.py:81:17: E126 continuation line over-indented for hanging indent

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~elopio/snapcraft/fix-pep8-and-doc-indentation into lp:snapcraft failed. Below is the output from the failed tests.

snapcraft/common.py:81:17: E126 continuation line over-indented for hanging indent

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~elopio/snapcraft/fix-pep8-and-doc-indentation into lp:snapcraft failed. Below is the output from the failed tests.

snapcraft/common.py:81:17: E126 continuation line over-indented for hanging indent

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~elopio/snapcraft/fix-pep8-and-doc-indentation into lp:snapcraft failed. Below is the output from the failed tests.

name: # the name of the snap
version: # the version of the snap
# The vendor for the snap (replace 'Vendor <email address hidden>')
vendor: Vendor <email address hidden>
summary: # 79 char long summary
description: # A longer description for the snap
icon: # A path to an icon for the package
cp --preserve=all -R zzz /tmp/tmpu9u848ie/parts/copy/install/zzz
cp --preserve=all -R src /tmp/tmp79huuwcn/parts/copy/install/dst
cp --preserve=all -R src /tmp/tmps1vpx7b4/parts/copy/install/dir/dst

...................................Warning: unable to find "test_relexepath" in the path
.................................F.................................
======================================================================
FAIL: test_init_with_source_branch_and_tag_raises_exception (snapcraft.tests.test_sources.TestMercurial)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/tarmac/branch.DenRbR/snapcraft/tests/test_sources.py", line 275, in test_init_with_source_branch_and_tag_raises_exception
    self.assertEqual(raised.exception.message, expected_message)
AssertionError: "can't specify both source-tag and source-branch for a mercurial source" != "can't specify both source-tag and source-branch "
- can't specify both source-tag and source-branch for a mercurial source
? ----------------------
+ can't specify both source-tag and source-branch

======================================================================
FAIL: test_invalid_names (snapcraft.tests.test_yaml.TestValidation) (key='package@awesome')
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/tarmac/branch.DenRbR/snapcraft/tests/test_yaml.py", line 373, in test_invalid_names
    msg=data)
AssertionError: "'package@awesome' does not match '^[a-z0-9][a-z0-9+-]*$'" != "'{}' does not match "
- 'package@awesome' does not match '^[a-z0-9][a-z0-9+-]*$'
+ '{}' does not match
 : {'description': 'description which can be pretty long', 'version': '1.0-snapcraft1~ppa1', 'icon': 'my-icon.png', 'vendor': 'Me <email address hidden>', 'summary': 'my summary less that 79 chars', 'name': 'package@awesome', 'parts': {'part1': {'plugin': 'project'}}}

======================================================================
FAIL: test_invalid_names (snapcraft.tests.test_yaml.TestValidation) (key='something.another')
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/tarmac/branch.DenRbR/snapcraft/tests/test_yaml.py", line 373, in test_invalid_names
    msg=data)
AssertionError: "'something.another' does not match '^[a-z0-9][a-z0-9+-]*$'" != "'{}' does not match "
- 'something.another' does not match '^[a-z0-9][a-z0-9+-]*$'
+ '{}' does not match
 : {'description': 'description which can be pretty long', 'version': '1.0-snapcraft1~ppa1', 'icon': 'my-icon.png', 'vendor': 'Me <email address hidden>', 'summary': 'my summary less that 79 chars', 'name': 'so...

[Snappy Tarmac (snappydevtarmac)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Leo Arias (elopio)]

oh come on!

[Leo Arias (elopio)]

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~elopio/snapcraft/fix-pep8-and-doc-indentation into lp:snapcraft failed. Below is the output from the failed tests.

snapcraft/tests/test_yaml.py:372:25: E126 continuation line over-indented for hanging indent
snapcraft/tests/test_yaml.py:372:25: E126 continuation line over-indented for hanging indent

[Snappy Tarmac (snappydevtarmac)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Leo Arias (elopio)]

review: Approve

[Leo Arias (elopio)]

spam spam spam spam.

=== modified file 'docs/snapcraft-advanced-features.md'
--- docs/snapcraft-advanced-features.md	2015-10-01 08:54:15 +0000
+++ docs/snapcraft-advanced-features.md	2015-10-05 19:37:43 +0000
@@ -74,11 +74,11 @@
 assemble and build the snap:
 
 	parts:
-  	spongeshaker:
+  	  spongeshaker:
 	    plugin: python2
 	    source: git://github.com/markokr/spongeshaker.git
 	  make-project:
-		  plugin: make
+	    plugin: make
 	    source: .
 
 The example above mixes and matches parts of different origin. Locally it
 
=== modified file 'examples/py2-project/sha3sum.py'
--- examples/py2-project/sha3sum.py	2015-07-17 14:44:45 +0000
+++ examples/py2-project/sha3sum.py	2015-10-05 19:37:43 +0000
@@ -12,4 +12,3 @@
         data = fp.read()
     h.update(data)
     print(h.hexdigest())
-
 
=== modified file 'examples/py3-project/sha3sum.py'
--- examples/py3-project/sha3sum.py	2015-07-15 09:55:27 +0000
+++ examples/py3-project/sha3sum.py	2015-10-05 19:37:43 +0000
@@ -12,4 +12,3 @@
         data = fp.read()
     h.update(data)
     print(h.hexdigest())
-
 
=== modified file 'examples/webcam-webui/config.py'
--- examples/webcam-webui/config.py	2015-09-15 20:53:36 +0000
+++ examples/webcam-webui/config.py	2015-10-05 19:37:43 +0000
@@ -17,7 +17,8 @@
     if config_yaml:
         set_config(config_file, config_yaml)
 
-    yaml.dump(get_config(config_file), stream=sys.stdout, default_flow_style=False)
+    yaml.dump(get_config(config_file), stream=sys.stdout,
+              default_flow_style=False)
 
 
 def set_config(config_file, config_yaml={}):
@@ -37,9 +38,11 @@
 
 def _config(config_yaml={}):
     try:
-        interval_value = config_yaml['config'][os.environ['SNAP_NAME']]['interval']
+        interval_value = config_yaml['config'][
+            os.environ['SNAP_NAME']]['interval']
         if not isinstance(interval_value, int):
-            config_yaml['config'][os.environ['SNAP_NAME']]['interval'] = _DEFAULT_INTERVAL
+            config_yaml['config'][
+                os.environ['SNAP_NAME']]['interval'] = _DEFAULT_INTERVAL
     except KeyError:
         interval = {
             'config': {
 
=== modified file 'integration-tests/data/pypi-config/config.py'
--- integration-tests/data/pypi-config/config.py	2015-09-17 19:05:20 +0000
+++ integration-tests/data/pypi-config/config.py	2015-10-05 19:37:43 +0000
@@ -17,7 +17,9 @@
     if config_yaml:
         set_config(config_file, config_yaml)
 
-    yaml.dump(get_config(config_file), stream=sys.stdout, default_flow_style=False)
+    yaml.dump(get_config(config_file),
+              stream=sys.stdout,
+              default_flow_style=False)
 
 
 def set_config(config_file, config_yaml={}):
@@ -37,9 +39,11 @@
 
 def _config(config_yaml={}):
     try:
-        interval_value = config_yaml['config'][os.environ['SNAP_NAME']]['interval']
+        interval_value = config_yaml['config'][
+            os.environ['SNAP_NAME']]['interval']
         if not isinstance(interval_value, int):
-            config_yaml['config'][os.environ['SNAP_NAME']]['interval'] = _DEFAULT_INTERVAL
+            config_yaml['config'][
+                os.environ['SNAP_NAME']]['interval'] = _DEFAULT_INTERVAL
     except KeyError:
         interval = {
             'config': {
 
=== modified file 'runtests.sh'
--- runtests.sh	2015-10-02 02:24:13 +0000
+++ runtests.sh	2015-10-05 19:37:43 +0000
@@ -48,7 +48,7 @@
     # These three checks could easily be done with flake8 in one shot if
     # we had python3-flake8 provide flake8
     # Ignore 501 (line-too-long)
-    pep8 $SRC_PATHS --ignore=E501
+    pep8 $SRC_PATHS
 
     pyflakes3 $SRC_PATHS
 
 
=== modified file 'setup.py'
--- setup.py	2015-09-02 15:10:58 +0000
+++ setup.py	2015-10-05 19:37:43 +0000
@@ -37,8 +37,10 @@
       package_data={'snapcraft': ['manifest.txt']},
       scripts=['bin/snapcraft'],
       data_files=[
-          ('share/snapcraft/plugins', ['plugins/' + x for x in os.listdir('plugins')]),
-          ('share/snapcraft/schema', ['schema/' + x for x in os.listdir('schema')]),
+          ('share/snapcraft/plugins',
+              ['plugins/' + x for x in os.listdir('plugins')]),
+          ('share/snapcraft/schema',
+              ['schema/' + x for x in os.listdir('schema')]),
       ],
       cmdclass={'test': TestCommand},
       )
 
=== modified file 'snapcraft/__init__.py'
--- snapcraft/__init__.py	2015-09-29 08:37:47 +0000
+++ snapcraft/__init__.py	2015-10-05 19:37:43 +0000
@@ -42,8 +42,10 @@
         self.partdir = os.path.join(os.getcwd(), "parts", self.name)
         self.sourcedir = os.path.join(os.getcwd(), "parts", self.name, "src")
         self.builddir = os.path.join(os.getcwd(), "parts", self.name, "build")
-        self.ubuntudir = os.path.join(os.getcwd(), "parts", self.name, 'ubuntu')
-        self.installdir = os.path.join(os.getcwd(), "parts", self.name, "install")
+        self.ubuntudir = os.path.join(os.getcwd(), "parts", self.name,
+                                      'ubuntu')
+        self.installdir = os.path.join(os.getcwd(), "parts", self.name,
+                                       "install")
         self.stagedir = os.path.join(os.getcwd(), "stage")
         self.snapdir = os.path.join(os.getcwd(), "snap")
 
@@ -84,17 +86,23 @@
     def isurl(self, url):
         return snapcraft.common.isurl(url)
 
-    def get_source(self, source, source_type=None, source_tag=None, source_branch=None):
+    def get_source(self, source, source_type=None, source_tag=None,
+                   source_branch=None):
         try:
             handler_class = _get_source_handler(source_type, source)
         except ValueError:
-            logger.error("Unrecognized source '%s' for part '%s'.", source, self.name)
+            logger.error("Unrecognized source '%s' for part '%s'.", source,
+                         self.name)
             snapcraft.common.fatal()
 
         try:
-            handler = handler_class(source, self.sourcedir, source_tag, source_branch)
+            handler = handler_class(source, self.sourcedir, source_tag,
+                                    source_branch)
         except snapcraft.sources.IncompatibleOptionsError as e:
-            logger.error('Issues while setting up sources for part \'%s\': %s.', self.name, e.message)
+            logger.error(
+                'Issues while setting up sources for part \'%s\': %s.',
+                self.name,
+                e.message)
             snapcraft.common.fatal()
         if not handler.pull():
             return False
@@ -115,16 +123,23 @@
     def setup_stage_packages(self):
         part_stage_packages = getattr(self.options, 'stage_packages', []) or []
         if self.PLUGIN_STAGE_PACKAGES or part_stage_packages:
-            ubuntu = snapcraft.repo.Ubuntu(self.ubuntudir, sources=self.PLUGIN_STAGE_SOURCES)
+            ubuntu = snapcraft.repo.Ubuntu(self.ubuntudir,
+                                           sources=self.PLUGIN_STAGE_SOURCES)
             ubuntu.get(self.PLUGIN_STAGE_PACKAGES + part_stage_packages)
             ubuntu.unpack(self.installdir)
             self._fixup(self.installdir)
 
     def _fixup(self, root):
         if os.path.isfile(os.path.join(root, 'usr', 'bin', 'xml2-config')):
-            self.run(['sed', '-i', '-e', 's|prefix=/usr|prefix={}/usr|'.format(root), os.path.join(root, 'usr', 'bin', 'xml2-config')])
+            self.run(
+                ['sed', '-i', '-e', 's|prefix=/usr|prefix={}/usr|'.
+                    format(root),
+                 os.path.join(root, 'usr', 'bin', 'xml2-config')])
         if os.path.isfile(os.path.join(root, 'usr', 'bin', 'xslt-config')):
-            self.run(['sed', '-i', '-e', 's|prefix=/usr|prefix={}/usr|'.format(root), os.path.join(root, 'usr', 'bin', 'xslt-config')])
+            self.run(
+                ['sed', '-i', '-e', 's|prefix=/usr|prefix={}/usr|'.
+                    format(root),
+                 os.path.join(root, 'usr', 'bin', 'xslt-config')])
 
 
 def _get_source_handler(source_type, source):
 
=== modified file 'snapcraft/cmds.py'
--- snapcraft/cmds.py	2015-10-04 20:03:23 +0000
+++ snapcraft/cmds.py	2015-10-05 19:37:43 +0000
@@ -54,7 +54,8 @@
     if args.part:
         yaml += 'parts:\n'
     for part_name in args.part:
-        part = snapcraft.plugin.load_plugin(part_name, part_name, load_code=False)
+        part = snapcraft.plugin.load_plugin(part_name, part_name,
+                                            load_code=False)
         yaml += '    ' + part.names()[0] + ':\n'
         for opt in part.config.get('options', []):
             if part.config['options'][opt].get('required', False):
@@ -73,7 +74,10 @@
     common.env = config.stage_env()
     userCommand = args.userCommand
     if not userCommand:
-        userCommand = ['/usr/bin/env', 'PS1=\[\e[1;32m\]snapcraft:\w\$\[\e[0m\] ', '/bin/bash', '--norc']
+        userCommand = ['/usr/bin/env',
+                       'PS1=\[\e[1;32m\]snapcraft:\w\$\[\e[0m\] ',
+                       '/bin/bash',
+                       '--norc']
     common.run(userCommand)
 
 
@@ -168,7 +172,8 @@
     qemu_img = os.path.join(qemudir, "15.04.img")
     if not os.path.exists(qemu_img):
         os.makedirs(qemudir, exist_ok=True)
-        logger.info('Setting up virtual snappy environment, root access required')
+        logger.info(
+            'Setting up virtual snappy environment, root access required')
         common.run([
             'sudo', 'ubuntu-device-flash', 'core', '15.04', '--developer-mode',
             '--enable-ssh', '-o', os.path.relpath(qemu_img, qemudir)],
@@ -181,7 +186,8 @@
         # the snapcraft run workflow.
         #
         # For example:
-        # $ export SNAPCRAFT_RUN_QEMU_ARGS="-usb -device usb-host,hostbus=1,hostaddr=10"
+        # $ export SNAPCRAFT_RUN_QEMU_ARGS=\
+        #       "-usb -device usb-host,hostbus=1,hostaddr=10"
         # $ snapcraft run
         qemu_args = os.getenv("SNAPCRAFT_RUN_QEMU_ARGS")
         if qemu_args is not None:
@@ -258,7 +264,9 @@
     for part in parts:
         # Gather our own files up
         fileset = getattr(part.code.options, 'stage', ['*']) or ['*']
-        part_files, _ = snapcraft.plugin.migratable_filesets(fileset, part.installdir)
+        part_files, _ = snapcraft.plugin.migratable_filesets(
+            fileset,
+            part.installdir)
 
         # Scan previous parts for collisions
         for other_part_name in parts_files:
@@ -266,19 +274,27 @@
             conflict_files = []
             for f in common:
                 this = os.path.join(part.installdir, f)
-                other = os.path.join(parts_files[other_part_name]['installdir'], f)
+                other = os.path.join(
+                    parts_files[other_part_name]['installdir'],
+                    f)
                 if os.path.islink(this) and os.path.islink(other):
                     continue
                 if not filecmp.cmp(this, other, shallow=False):
                     conflict_files.append(f)
 
             if conflict_files:
-                logger.error('Error: parts %s and %s have the following file paths in common which have different contents:\n  %s', other_part_name, part.names()[0], '\n  '.join(sorted(conflict_files)))
+                logger.error('Error: parts %s and %s have the following file '
+                             'paths in common which have different '
+                             'contents:\n  %s',
+                             other_part_name,
+                             part.names()[0],
+                             '\n  '.join(sorted(conflict_files)))
 
                 return False
 
         # And add our files to the list
-        parts_files[part.names()[0]] = {'files': part_files, 'installdir': part.installdir}
+        parts_files[part.names()[0]] = {'files': part_files,
+                                        'installdir': part.installdir}
 
     return True
 
@@ -305,9 +321,9 @@
                 # This ends up running multiple times, as each part gets to its
                 # staging cmd.  That's inefficient, but largely OK.
                 # FIXME: fix the above by iterating over cmds before iterating
-                # all_parts.  But then we need to make sure we continue to handle
-                # cases like go, where you want go built before trying to pull
-                # a go project.
+                # all_parts.  But then we need to make sure we continue to
+                # handle cases like go, where you want go built before trying
+                # to pull a go project.
                 if not _check_for_collisions(config.all_parts):
                     sys.exit(1)
 
@@ -337,7 +353,9 @@
 def _install_build_packages(packages):
     new_packages = []
     for check_pkg in packages:
-        if subprocess.call(['dpkg-query', '-s', check_pkg], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) != 0:
+        if subprocess.call(['dpkg-query', '-s', check_pkg],
+                           stdout=subprocess.DEVNULL,
+                           stderr=subprocess.DEVNULL) != 0:
             new_packages.append(check_pkg)
     if new_packages:
         logger.info('Installing required packages on the host system')
@@ -361,8 +379,9 @@
         return _config
     except snapcraft.yaml.SnapcraftYamlFileError as e:
         logger.error(
-            'Could not find {}.  Are you sure you are in the right directory?\n'
-            'To start a new project, use \'snapcraft init\''.format(e.file))
+            'Could not find {}.  Are you sure you are in the right '
+            'directory?\nTo start a new project, use \'snapcraft '
+            'init\''.format(e.file))
         sys.exit(1)
     except snapcraft.yaml.SnapcraftSchemaError as e:
         msg = "Issues while validating snapcraft.yaml: {}".format(e.message)
@@ -374,5 +393,6 @@
             'missing for the "{}" part.'.format(e.part))
         sys.exit(1)
     except snapcraft.yaml.SnapcraftLogicError as e:
-        logger.error('Issue detected while analyzing snapcraft.yaml: {}'.format(e.message))
+        logger.error('Issue detected while analyzing '
+                     'snapcraft.yaml: {}'.format(e.message))
         sys.exit(1)
 
=== modified file 'snapcraft/common.py'
--- snapcraft/common.py	2015-09-18 21:23:40 +0000
+++ snapcraft/common.py	2015-10-05 19:37:43 +0000
@@ -57,7 +57,8 @@
         f.write('\n')
         f.write('exec $*')
         f.flush()
-        return subprocess.check_output(['/bin/sh', f.name] + cmd, **kwargs).decode('utf8').strip()
+        return subprocess.check_output(['/bin/sh', f.name] + cmd,
+                                       **kwargs).decode('utf8').strip()
 
 
 def fatal():
@@ -67,14 +68,17 @@
 def get_arch():
     global _arch
     if _arch is None:
-        _arch = subprocess.check_output(['dpkg-architecture', '-qDEB_BUILD_ARCH']).decode('utf8').strip()
+        _arch = subprocess.check_output(
+            ['dpkg-architecture', '-qDEB_BUILD_ARCH']).decode('utf8').strip()
     return _arch
 
 
 def get_arch_triplet():
     global _arch_triplet
     if _arch_triplet is None:
-        _arch_triplet = subprocess.check_output(['dpkg-architecture', '-qDEB_BUILD_MULTIARCH']).decode('utf8').strip()
+        _arch_triplet = subprocess.check_output(
+            ['dpkg-architecture', '-qDEB_BUILD_MULTIARCH']
+        ).decode('utf8').strip()
     return _arch_triplet
 
 
 
=== modified file 'snapcraft/main.py'
--- snapcraft/main.py	2015-09-17 14:14:14 +0000
+++ snapcraft/main.py	2015-10-05 19:37:43 +0000
@@ -30,9 +30,11 @@
     # Parent parsers
 
     force_parser = argparse.ArgumentParser(add_help=False)
-    force_parser.add_argument('--force', action='store_true', help='redo all steps for all parts')
+    force_parser.add_argument('--force', action='store_true',
+                              help='redo all steps for all parts')
 
-    cmd_parser = argparse.ArgumentParser(add_help=False, parents=[force_parser])
+    cmd_parser = argparse.ArgumentParser(add_help=False,
+                                         parents=[force_parser])
     cmd_parser.add_argument('part', nargs='*')
 
     # Command parsers
@@ -42,28 +44,44 @@
     parser.set_defaults(func=snapcraft.cmds.init)
 
     parser = subparsers.add_parser('shell', help='enter staging environment')
-    parser.add_argument('userCommand', nargs=argparse.REMAINDER, metavar='cmd', help='optional command to run inside staging environment')
+    parser.add_argument(
+        'userCommand', nargs=argparse.REMAINDER,
+        metavar='cmd',
+        help='optional command to run inside staging environment')
     parser.set_defaults(func=snapcraft.cmds.shell)
 
-    parser = subparsers.add_parser('run', help='run snap in kvm', add_help=False)
+    parser = subparsers.add_parser('run', help='run snap in kvm',
+                                   add_help=False)
     parser.set_defaults(func=snapcraft.cmds.run)
 
-    parser = subparsers.add_parser('clean', help='clean up the environment (to start from scratch)')
+    parser = subparsers.add_parser(
+        'clean',
+        help='clean up the environment (to start from scratch)')
     parser.set_defaults(func=snapcraft.cmds.clean)
 
-    parser = subparsers.add_parser('pull', help='get sources', parents=[cmd_parser])
-    parser.set_defaults(func=snapcraft.cmds.cmd)
-
-    parser = subparsers.add_parser('build', help='build parts', parents=[cmd_parser])
-    parser.set_defaults(func=snapcraft.cmds.cmd)
-
-    parser = subparsers.add_parser('stage', help='put parts into staging area', parents=[cmd_parser])
-    parser.set_defaults(func=snapcraft.cmds.cmd)
-
-    parser = subparsers.add_parser('snap', help='put parts into snap area', parents=[cmd_parser])
+    parser = subparsers.add_parser('pull', help='get sources',
+                                   parents=[cmd_parser])
+    parser.set_defaults(func=snapcraft.cmds.cmd)
+
+    parser = subparsers.add_parser('build', help='build parts',
+                                   parents=[cmd_parser])
+    parser.set_defaults(func=snapcraft.cmds.cmd)
+
+    parser = subparsers.add_parser(
+        'stage',
+        help='put parts into staging area', parents=[cmd_parser])
+    parser.set_defaults(func=snapcraft.cmds.cmd)
+
+    parser = subparsers.add_parser(
+        'snap',
+        help='put parts into snap area',
+        parents=[cmd_parser])
     parser.set_defaults(func=snapcraft.cmds.snap)
 
-    parser = subparsers.add_parser('assemble', help='make snap package', parents=[force_parser], aliases=['all'])
+    parser = subparsers.add_parser(
+        'assemble',
+        help='make snap package', parents=[force_parser],
+        aliases=['all'])
     parser.set_defaults(func=snapcraft.cmds.assemble)
 
     # Now run parser
 
=== modified file 'snapcraft/meta.py'
--- snapcraft/meta.py	2015-09-30 09:19:00 +0000
+++ snapcraft/meta.py	2015-10-05 19:37:43 +0000
@@ -91,7 +91,8 @@
     args = execparts[1:] if len(execparts) > 1 else []
 
     config_hook_path = os.path.join(hooks_dir, 'config')
-    _write_wrap_exe(execparts[0], config_hook_path, args=args, cwd='$SNAP_APP_PATH')
+    _write_wrap_exe(execparts[0], config_hook_path, args=args,
+                    cwd='$SNAP_APP_PATH')
 
 
 def _copy(meta_dir, relpath, new_relpath=None):
@@ -110,8 +111,10 @@
     for runnable in runnables:
         for entry in ('security-policy', 'security-override'):
             if entry in runnable:
-                runnable[entry]['apparmor'] = _copy(meta_dir, runnable[entry]['apparmor'])
-                runnable[entry]['seccomp'] = _copy(meta_dir, runnable[entry]['seccomp'])
+                runnable[entry]['apparmor'] = \
+                    _copy(meta_dir, runnable[entry]['apparmor'])
+                runnable[entry]['seccomp'] = \
+                    _copy(meta_dir, runnable[entry]['seccomp'])
 
     return runnables
 
@@ -140,12 +143,14 @@
     if 'binaries' in config_data:
         binaries = config_data['binaries']
         binaries = _wrap_binaries(binaries)
-        package_yaml['binaries'] = _copy_security_profiles(meta_dir, _repack_names(binaries))
+        package_yaml['binaries'] = \
+            _copy_security_profiles(meta_dir, _repack_names(binaries))
 
     if 'services' in config_data:
         services = config_data['services']
         services = _wrap_services(services)
-        package_yaml['services'] = _copy_security_profiles(meta_dir, _repack_names(services))
+        package_yaml['services'] = \
+            _copy_security_profiles(meta_dir, _repack_names(services))
 
     return package_yaml
 
@@ -159,7 +164,8 @@
 
 
 def _compose_readme(config_data):
-    return '{config[summary]}\n{config[description]}\n'.format(config=config_data)
+    s = '{config[summary]}\n{config[description]}\n'
+    return s.format(config=config_data)
 
 
 def _replace_cmd(execparts, cmd):
@@ -199,7 +205,8 @@
     wrapexec = '$SNAP_APP_PATH/{}'.format(relexepath)
     if not os.path.exists(exepath) and '/' not in relexepath:
         # If it doesn't exist it might be in the path
-        logger.debug('Checking to see if "{}" is in the $PATH'.format(relexepath))
+        logger.debug('Checking to see if "{}" is in the $PATH'.format(
+            relexepath))
         with tempfile.NamedTemporaryFile('w+') as tempf:
             script = ('#!/bin/sh\n' +
                       '{}\n'.format(common.assemble_env()) +
@@ -209,7 +216,8 @@
             if common.run(['/bin/sh', tempf.name], cwd=snap_dir):
                 wrapexec = relexepath
             else:
-                logger.warning('Warning: unable to find "{}" in the path'.format(relexepath))
+                logger.warning('Warning: unable to find "{}" in the path'.
+                               format(relexepath))
 
     _write_wrap_exe(wrapexec, wrappath)
 
 
=== modified file 'snapcraft/plugin.py'
--- snapcraft/plugin.py	2015-09-22 10:39:06 +0000
+++ snapcraft/plugin.py	2015-10-05 19:37:43 +0000
@@ -49,7 +49,8 @@
 
 class PluginHandler:
 
-    def __init__(self, name, part_name, properties, load_code=True, load_config=True):
+    def __init__(self, name, part_name, properties, load_code=True,
+                 load_config=True):
         self.valid = False
         self.code = None
         self.config = {}
@@ -107,7 +108,8 @@
                 setattr(options, attrname, properties[opt])
             else:
                 if opt_parameters.get('required', False):
-                    raise PluginError('Required field {} missing on part {}'.format(opt, name))
+                    raise PluginError('Required field {} missing on part {}'.
+                                      format(opt, name))
                 setattr(options, attrname, None)
 
         return options
@@ -117,7 +119,8 @@
         module_name = name.replace('-', '_')
 
         try:
-            module = importlib.import_module('snapcraft.plugins.' + module_name)
+            module = importlib.import_module('snapcraft.plugins.' +
+                                             module_name)
         except ImportError:
             module = None
 
@@ -160,7 +163,8 @@
         try:
             with open(self.statefile, 'r') as f:
                 lastStep = f.read()
-                return common.COMMAND_ORDER.index(stage) > common.COMMAND_ORDER.index(lastStep)
+                return (common.COMMAND_ORDER.index(stage) >
+                        common.COMMAND_ORDER.index(lastStep))
         except Exception:
             return True
 
@@ -179,7 +183,8 @@
             return True
         self.makedirs()
 
-        run_setup_stage_packages = self.code and hasattr(self.code, 'setup_stage_packages')
+        run_setup_stage_packages = self.code and \
+            hasattr(self.code, 'setup_stage_packages')
         run_pull = self.code and hasattr(self.code, 'pull')
 
         if run_setup_stage_packages or run_pull:
@@ -248,7 +253,8 @@
         snap_files, snap_dirs = self._migratable_fileset_for('stage')
 
         try:
-            _migrate_files(snap_files, snap_dirs, self.installdir, self.stagedir)
+            _migrate_files(snap_files, snap_dirs, self.installdir,
+                           self.stagedir)
         except FileNotFoundError as e:
             logger.error('Could not find file %s defined in stage',
                          os.path.relpath(e.filename, os.path.curdir))
@@ -284,7 +290,8 @@
 
 
 def load_plugin(part_name, plugin_name, properties={}, load_code=True):
-    part = PluginHandler(plugin_name, part_name, properties, load_code=load_code)
+    part = PluginHandler(plugin_name, part_name, properties,
+                         load_code=load_code)
     if not part.is_valid():
         logger.error('Could not load part %s', plugin_name)
         sys.exit(1)
@@ -300,10 +307,13 @@
     # And chop files, including whole trees if any dirs are mentioned
     snap_files = include_files - exclude_files
     for exclude_dir in exclude_dirs:
-        snap_files = set([x for x in snap_files if not x.startswith(exclude_dir + '/')])
+        snap_files = set([x for x in snap_files
+                          if not x.startswith(exclude_dir + '/')])
 
     # Separate dirs from files
-    snap_dirs = set([x for x in snap_files if os.path.isdir(os.path.join(srcdir, x)) and not os.path.islink(os.path.join(srcdir, x))])
+    snap_dirs = set([x for x in snap_files
+                     if os.path.isdir(os.path.join(srcdir, x)) and
+                     not os.path.islink(os.path.join(srcdir, x))])
     snap_files = snap_files - snap_dirs
 
     return snap_files, snap_dirs
@@ -356,8 +366,12 @@
     # files from an include like 'lib'
     for include_dir in include_dirs:
         for root, dirs, files in os.walk(include_dir):
-            include_files |= set([os.path.relpath(os.path.join(root, d), directory) for d in dirs])
-            include_files |= set([os.path.relpath(os.path.join(root, f), directory) for f in files])
+            include_files |= \
+                set([os.path.relpath(os.path.join(root, d), directory)
+                     for d in dirs])
+            include_files |= \
+                set([os.path.relpath(os.path.join(root, f), directory)
+                     for f in files])
 
     return include_files
 
@@ -369,8 +383,10 @@
         matches = glob.glob(os.path.join(directory, exclude))
         exclude_files |= set(matches)
 
-    exclude_dirs = [os.path.relpath(x, directory) for x in exclude_files if os.path.isdir(x)]
-    exclude_files = set([os.path.relpath(x, directory) for x in exclude_files])
+    exclude_dirs = [os.path.relpath(x, directory)
+                    for x in exclude_files if os.path.isdir(x)]
+    exclude_files = set([os.path.relpath(x, directory)
+                         for x in exclude_files])
 
     return exclude_files, exclude_dirs
 
 
=== modified file 'snapcraft/plugins/ant.py'
--- snapcraft/plugins/ant.py	2015-10-01 08:54:15 +0000
+++ snapcraft/plugins/ant.py	2015-10-05 19:37:43 +0000
@@ -36,7 +36,8 @@
             return False
         files = glob.glob(os.path.join(self.builddir, 'target', '*.jar'))
         if not files:
-            logger.error('Could not find any built jar files for part %s', self.name)
+            logger.error('Could not find any built jar files for part %s',
+                         self.name)
             sys.exit(1)
         jardir = os.path.join(self.installdir, 'jar')
         return self.run(['mkdir', '-p', jardir]) and \
 
=== modified file 'snapcraft/plugins/autotools.py'
--- snapcraft/plugins/autotools.py	2015-10-01 08:54:15 +0000
+++ snapcraft/plugins/autotools.py	2015-10-05 19:37:43 +0000
@@ -28,5 +28,5 @@
         if not os.path.exists(os.path.join(self.builddir, "configure")):
             if not self.run(['env', 'NOCONFIGURE=1', './autogen.sh']):
                 return False
-        return self.run(['./configure', '--prefix='] + self.options.configflags) and \
-            super().build()
+        return self.run(['./configure', '--prefix='] +
+                        self.options.configflags) and super().build()
 
=== modified file 'snapcraft/plugins/cmake.py'
--- snapcraft/plugins/cmake.py	2015-10-01 08:54:15 +0000
+++ snapcraft/plugins/cmake.py	2015-10-05 19:37:43 +0000
@@ -24,5 +24,5 @@
             self.options.configflags = []
 
     def build(self):
-        return self.run(['cmake', '.', '-DCMAKE_INSTALL_PREFIX='] + self.options.configflags) and \
-            super().build()
+        return self.run(['cmake', '.', '-DCMAKE_INSTALL_PREFIX='] +
+                        self.options.configflags) and super().build()
 
=== modified file 'snapcraft/plugins/copy.py'
--- snapcraft/plugins/copy.py	2015-08-26 08:52:09 +0000
+++ snapcraft/plugins/copy.py	2015-10-05 19:37:43 +0000
@@ -37,5 +37,6 @@
             dst_dir = os.path.dirname(dst)
             if not os.path.exists(dst_dir):
                 os.makedirs(dst_dir)
-            res &= self.run(["cp", "--preserve=all", "-R", src, dst], cwd=os.getcwd())
+            res &= self.run(["cp", "--preserve=all", "-R", src, dst],
+                            cwd=os.getcwd())
         return res
 
=== modified file 'snapcraft/plugins/go.py'
--- snapcraft/plugins/go.py	2015-10-01 08:54:15 +0000
+++ snapcraft/plugins/go.py	2015-10-05 19:37:43 +0000
@@ -43,7 +43,8 @@
             return False
         if not self.run(['go', 'install', self.fullname]):
             return False
-        return self.run(['cp', '-a', os.path.join(self.builddir, 'bin'), self.installdir])
+        return self.run(['cp', '-a', os.path.join(self.builddir, 'bin'),
+                        self.installdir])
 
     def run(self, cmd, **kwargs):
         cmd = ['env', 'GOPATH=' + self.builddir] + cmd
 
=== modified file 'snapcraft/plugins/maven.py'
--- snapcraft/plugins/maven.py	2015-10-01 08:54:15 +0000
+++ snapcraft/plugins/maven.py	2015-10-05 19:37:43 +0000
@@ -36,7 +36,8 @@
         jarfiles = glob.glob(os.path.join(self.builddir, 'target', '*.jar'))
         warfiles = glob.glob(os.path.join(self.builddir, 'target', '*.war'))
         if not (jarfiles or warfiles):
-            logger.error('Could not find any built jar or war files for part %s', self.name)
+            logger.error('Could not find any built jar or war files for '
+                         'part %s', self.name)
             snapcraft.common.fatal()
         if jarfiles:
             jardir = os.path.join(self.installdir, 'jar')
 
=== modified file 'snapcraft/plugins/python2.py'
--- snapcraft/plugins/python2.py	2015-10-01 08:54:15 +0000
+++ snapcraft/plugins/python2.py	2015-10-05 19:37:43 +0000
@@ -62,7 +62,8 @@
 
         if not os.path.exists(site_packages_dir):
             os.symlink(
-                os.path.join(prefix, 'lib', self.python_version, 'dist-packages'),
+                os.path.join(prefix, 'lib', self.python_version,
+                             'dist-packages'),
                 site_packages_dir)
 
         if not self.run(['python2', easy_install, '--prefix', prefix, 'pip']):
@@ -99,7 +100,8 @@
     @property
     def dist_packages_dir(self):
         return os.path.join(
-            self.installdir, 'usr', 'lib', self.python_version, 'dist-packages')
+            self.installdir, 'usr', 'lib', self.python_version,
+            'dist-packages')
 
     @property
     def python_version(self):
 
=== modified file 'snapcraft/plugins/python3.py'
--- snapcraft/plugins/python3.py	2015-10-02 16:45:13 +0000
+++ snapcraft/plugins/python3.py	2015-10-05 19:37:43 +0000
@@ -99,7 +99,8 @@
     @property
     def dist_packages_dir(self):
         return os.path.join(
-            self.installdir, 'usr', 'lib', self.python_version, 'dist-packages')
+            self.installdir, 'usr', 'lib', self.python_version,
+            'dist-packages')
 
     @property
     def python_version(self):
 
=== modified file 'snapcraft/plugins/qml.py'
--- snapcraft/plugins/qml.py	2015-09-08 21:21:07 +0000
+++ snapcraft/plugins/qml.py	2015-10-05 19:37:43 +0000
@@ -81,7 +81,8 @@
             "LD_LIBRARY_PATH=%s/usr/lib/%s:$LD_LIBRARY_PATH" % (root, arch),
             # Mir config
             "MIR_SOCKET=/run/mir_socket",
-            "MIR_CLIENT_PLATFORM_PATH=%s/usr/lib/%s/mir/client-platform" % (root, arch),
+            "MIR_CLIENT_PLATFORM_PATH={}/usr/lib/{}/mir/client-platform"
+            .format(root, arch),
             # XKB config
             "XKB_CONFIG_ROOT=%s/usr/share/X11/xkb" % root,
             # Qt Platform to Mir
@@ -89,14 +90,18 @@
             "QTCHOOSER_NO_GLOBAL_DIR=1",
             "QT_SELECT=snappy-qt5",
             # Qt Libs
-            "LD_LIBRARY_PATH=%s/usr/lib/%s/qt5/libs:$LD_LIBRARY_PATH" % (root, arch),
-            "LD_LIBRARY_PATH=%s/usr/lib/%s/pulseaudio:$LD_LIBRARY_PATH" % (root, arch),
+            "LD_LIBRARY_PATH={}/usr/lib/{}/qt5/libs:$LD_LIBRARY_PATH"
+            .format(root, arch),
+            "LD_LIBRARY_PATH={}/usr/lib/{}/pulseaudio:$LD_LIBRARY_PATH"
+            .format(root, arch),
             # Qt Modules
             "QT_PLUGIN_PATH=%s/usr/lib/%s/qt5/plugins" % (root, arch),
             "QML2_IMPORT_PATH=%s/usr/lib/%s/qt5/qml" % (root, arch),
             # Mesa Libs
-            "LD_LIBRARY_PATH=%s/usr/lib/%s/mesa:$LD_LIBRARY_PATH" % (root, arch),
-            "LD_LIBRARY_PATH=%s/usr/lib/%s/mesa-egl:$LD_LIBRARY_PATH" % (root, arch),
+            "LD_LIBRARY_PATH={}/usr/lib/{}/mesa:$LD_LIBRARY_PATH"
+            .format(root, arch),
+            "LD_LIBRARY_PATH={}/usr/lib/{}/mesa-egl:$LD_LIBRARY_PATH"
+            .format(root, arch),
             # XDG Config
             "XDG_CONFIG_DIRS=%s/etc/xdg:$XDG_CONFIG_DIRS" % root,
             "XDG_CONFIG_DIRS=%s/usr/xdg:$XDG_CONFIG_DIRS" % root,
 
=== modified file 'snapcraft/repo.py'
--- snapcraft/repo.py	2015-09-30 17:23:17 +0000
+++ snapcraft/repo.py	2015-10-05 19:37:43 +0000
@@ -28,7 +28,8 @@
 
 import snapcraft.common
 
-_DEFAULT_SOURCES = '''deb http://${prefix}.ubuntu.com/${suffix}/ ${release} main restricted
+_DEFAULT_SOURCES = \
+    '''deb http://${prefix}.ubuntu.com/${suffix}/ ${release} main restricted
 deb http://${prefix}.ubuntu.com/${suffix}/ ${release}-updates main restricted
 deb http://${prefix}.ubuntu.com/${suffix}/ ${release} universe
 deb http://${prefix}.ubuntu.com/${suffix}/ ${release}-updates universe
@@ -103,7 +104,8 @@
                 skipped_essential.append(pkg.name)
                 pkg.mark_keep()
                 continue
-            if (pkg.name in manifest_dep_names and pkg.name not in package_names):
+            if (pkg.name in manifest_dep_names and
+                    pkg.name not in package_names):
                 skipped_blacklisted.append(pkg.name)
                 pkg.mark_keep()
                 continue
@@ -111,7 +113,8 @@
         if skipped_essential:
             print('Skipping priority essential packages:', skipped_essential)
         if skipped_blacklisted:
-            print('Skipping blacklisted from manifest packages:', skipped_blacklisted)
+            print('Skipping blacklisted from manifest packages:',
+                  skipped_blacklisted)
 
         # download the remaining ones with proper progress
         apt.apt_pkg.config.set("Dir::Cache::Archives", self.downloaddir)
@@ -131,7 +134,8 @@
     def _manifest_dep_names(self):
         manifest_dep_names = set()
 
-        with open(os.path.abspath(os.path.join(__file__, '..', 'manifest.txt'))) as f:
+        with open(os.path.abspath(os.path.join(__file__, '..',
+                                               'manifest.txt'))) as f:
             for line in f:
                 pkg = line.strip()
                 if pkg in self.apt_cache:
 
=== modified file 'snapcraft/sources.py'
--- snapcraft/sources.py	2015-09-29 08:11:32 +0000
+++ snapcraft/sources.py	2015-10-05 19:37:43 +0000
@@ -35,7 +35,8 @@
 
 class Base:
 
-    def __init__(self, source, source_dir, source_tag=None, source_branch=None):
+    def __init__(self, source, source_dir, source_tag=None,
+                 source_branch=None):
         self.source = source
         self.source_dir = source_dir
         self.source_tag = source_tag
@@ -45,35 +46,43 @@
         raise NotImplementedError('this is just a base class')
 
     def provision(self, dst):
-        return snapcraft.common.run(['cp', '-Trfa', self.source_dir, dst], cwd=os.getcwd())
+        return snapcraft.common.run(['cp', '-Trfa', self.source_dir, dst],
+                                    cwd=os.getcwd())
 
 
 class Bazaar(Base):
 
-    def __init__(self, source, source_dir, source_tag=None, source_branch=None):
+    def __init__(self, source, source_dir, source_tag=None,
+                 source_branch=None):
         super().__init__(source, source_dir, source_tag, source_branch)
         if source_branch:
-            raise IncompatibleOptionsError('can\'t specify a source-branch for a bzr source')
+            raise IncompatibleOptionsError(
+                'can\'t specify a source-branch for a bzr source')
 
     def pull(self):
         tag_opts = []
         if self.source_tag:
             tag_opts = ['-r', 'tag:' + self.source_tag]
         if os.path.exists(os.path.join(self.source_dir, ".bzr")):
-            cmd = ['bzr', 'pull'] + tag_opts + [self.source, '-d', self.source_dir]
+            cmd = ['bzr', 'pull'] + tag_opts + \
+                  [self.source, '-d', self.source_dir]
         else:
             os.rmdir(self.source_dir)
-            cmd = ['bzr', 'branch'] + tag_opts + [self.source, self.source_dir]
+            cmd = ['bzr', 'branch'] + tag_opts + \
+                  [self.source, self.source_dir]
 
         return snapcraft.common.run(cmd, cwd=os.getcwd())
 
 
 class Git(Base):
 
-    def __init__(self, source, source_dir, source_tag=None, source_branch=None):
+    def __init__(self, source, source_dir, source_tag=None,
+                 source_branch=None):
         super().__init__(source, source_dir, source_tag, source_branch)
         if source_tag and source_branch:
-            raise IncompatibleOptionsError('can\'t specify both source-tag and source-branch for a git source')
+            raise IncompatibleOptionsError(
+                'can\'t specify both source-tag and source-branch for '
+                'a git source')
 
     def pull(self):
         if os.path.exists(os.path.join(self.source_dir, ".git")):
@@ -86,18 +95,23 @@
         else:
             branch_opts = []
             if self.source_tag or self.source_branch:
-                branch_opts = ['--branch', self.source_tag or self.source_branch]
-            cmd = ['git', 'clone'] + branch_opts + [self.source, self.source_dir]
+                branch_opts = ['--branch',
+                               self.source_tag or self.source_branch]
+            cmd = ['git', 'clone'] + branch_opts + \
+                  [self.source, self.source_dir]
 
         return snapcraft.common.run(cmd, cwd=os.getcwd())
 
 
 class Mercurial(Base):
 
-    def __init__(self, source, source_dir, source_tag=None, source_branch=None):
+    def __init__(self, source, source_dir, source_tag=None,
+                 source_branch=None):
         super().__init__(source, source_dir, source_tag, source_branch)
         if source_tag and source_branch:
-            raise IncompatibleOptionsError('can\'t specify both source-tag and source-branch for a mercurial source')
+            raise IncompatibleOptionsError(
+                'can\'t specify both source-tag and source-branch for a '
+                'mercurial source')
 
     def pull(self):
         if os.path.exists(os.path.join(self.source_dir, ".hg")):
@@ -118,23 +132,29 @@
 
 class Tar(Base):
 
-    def __init__(self, source, source_dir, source_tag=None, source_branch=None):
+    def __init__(self, source, source_dir, source_tag=None,
+                 source_branch=None):
         super().__init__(source, source_dir, source_tag, source_branch)
         if source_tag:
-            raise IncompatibleOptionsError('can\'t specify a source-tag for a tar source')
+            raise IncompatibleOptionsError(
+                'can\'t specify a source-tag for a tar source')
         elif source_branch:
-            raise IncompatibleOptionsError('can\'t specify a source-branch for a tar source')
+            raise IncompatibleOptionsError(
+                'can\'t specify a source-branch for a tar source')
 
     def pull(self):
         if snapcraft.common.isurl(self.source):
-            return snapcraft.common.run(['wget', '-q', '-c', self.source], cwd=self.source_dir)
+            return snapcraft.common.run(['wget', '-q', '-c', self.source],
+                                        cwd=self.source_dir)
         else:
             return True
 
     def provision(self, dst, clean_target=True):
         # TODO add unit tests.
         if snapcraft.common.isurl(self.source):
-            tarball = os.path.join(self.source_dir, os.path.basename(self.source))
+            tarball = os.path.join(
+                self.source_dir,
+                os.path.basename(self.source))
         else:
             tarball = os.path.abspath(self.source)
 
 
=== modified file 'snapcraft/tests/test_base_plugin.py'
--- snapcraft/tests/test_base_plugin.py	2015-09-29 08:37:47 +0000
+++ snapcraft/tests/test_base_plugin.py	2015-10-05 19:37:43 +0000
@@ -137,5 +137,6 @@
         self.assertEqual(raised.exception.code, 1, 'Wrong exit code returned.')
         expected = (
             'Issues while setting up sources for part \'test_plugin\': can\'t '
-            'specify a {} for a {} source.\n'.format(self.error, self.source_type))
+            'specify a {} for a {} source.\n'
+            .format(self.error, self.source_type))
         self.assertEqual(expected, fake_logger.output)
 
=== modified file 'snapcraft/tests/test_cmds.py'
--- snapcraft/tests/test_cmds.py	2015-09-18 16:52:06 +0000
+++ snapcraft/tests/test_cmds.py	2015-10-05 19:37:43 +0000
@@ -73,7 +73,8 @@
 
         self.assertFalse(cmds._check_for_collisions([part1, part2, part3]))
         self.assertEqual(
-            'Error: parts part2 and part3 have the following file paths in common which have different contents:\n'
+            'Error: parts part2 and part3 have the following file paths in '
+            'common which have different contents:\n'
             '  1\n'
             '  a/2\n',
             fake_logger.output)
 
=== modified file 'snapcraft/tests/test_copy_plugin.py'
--- snapcraft/tests/test_copy_plugin.py	2015-07-23 14:23:29 +0000
+++ snapcraft/tests/test_copy_plugin.py	2015-10-05 19:37:43 +0000
@@ -73,4 +73,5 @@
 
         c = CopyPlugin("copy", self.mock_options)
         self.assertTrue(c.build())
-        self.assertTrue(os.path.exists(os.path.join(self.dst_prefix, "dir/dst")))
+        self.assertTrue(os.path.exists(os.path.join(self.dst_prefix,
+                                                    "dir/dst")))
 
=== modified file 'snapcraft/tests/test_meta.py'
--- snapcraft/tests/test_meta.py	2015-09-21 05:04:31 +0000
+++ snapcraft/tests/test_meta.py	2015-10-05 19:37:43 +0000
@@ -44,7 +44,8 @@
         }
 
     def test_plain_no_binaries_or_services(self):
-        y = meta._compose_package_yaml('meta', self.config_data, ['armhf', 'amd64'])
+        y = meta._compose_package_yaml('meta', self.config_data,
+                                       ['armhf', 'amd64'])
 
         expected = {
             'name': 'my-package',
@@ -74,7 +75,8 @@
             'binary2': {'exec': 'binary2.sh'},
         }
 
-        y = meta._compose_package_yaml('meta', self.config_data, ['armhf', 'amd64'])
+        y = meta._compose_package_yaml('meta', self.config_data,
+                                       ['armhf', 'amd64'])
 
         self.assertEqual(len(y['binaries']), 2)
         for b in y['binaries']:
@@ -92,7 +94,8 @@
             },
         }
 
-        y = meta._compose_package_yaml('meta', self.config_data, ['armhf', 'amd64'])
+        y = meta._compose_package_yaml('meta', self.config_data,
+                                       ['armhf', 'amd64'])
 
         self.assertEqual(len(y['services']), 2)
         for b in y['services']:
@@ -105,7 +108,8 @@
     def test_plain_no_binaries_or_services_with_optionals(self):
         self.config_data['frameworks'] = ['mir', ]
 
-        y = meta._compose_package_yaml('meta', self.config_data, ['armhf', 'amd64'])
+        y = meta._compose_package_yaml('meta', self.config_data,
+                                       ['armhf', 'amd64'])
 
         expected = {
             'name': 'my-package',
@@ -120,7 +124,8 @@
 
     def test_compose_readme(self):
         self.config_data['summary'] = 'one line summary'
-        self.config_data['description'] = 'the description\nwhich can be longer'
+        self.config_data['description'] = \
+            'the description\nwhich can be longer'
 
         readme_text = '''one line summary
 the description
@@ -170,7 +175,8 @@
             }
         }
 
-        self.meta_dir = os.path.join(os.path.abspath(os.curdir), 'snap', 'meta')
+        self.meta_dir = os.path.join(os.path.abspath(os.curdir),
+                                     'snap', 'meta')
         self.hooks_dir = os.path.join(self.meta_dir, 'hooks')
 
         self.expected_open_calls = [
@@ -263,7 +269,8 @@
         mock_wrap_exe.assert_has_calls([
             call(
                 '$SNAP_APP_PATH/bin/bash',
-                os.path.join(os.path.abspath(os.curdir), 'snap/bin/bash.wrapper'),
+                os.path.join(os.path.abspath(os.curdir),
+                             'snap/bin/bash.wrapper'),
             ),
             call(
                 'bin/config',
@@ -273,14 +280,18 @@
             ),
         ])
         self.mock_copyfile.assert_has_calls([
-            call('my-icon.png', os.path.join(self.meta_dir, 'my-icon.png')),
-            call('file.apparmor', os.path.join(self.meta_dir, 'file.apparmor')),
-            call('file.seccomp', os.path.join(self.meta_dir, 'file.seccomp')),
+            call('my-icon.png', os.path.join(self.meta_dir,
+                 'my-icon.png')),
+            call('file.apparmor', os.path.join(self.meta_dir,
+                 'file.apparmor')),
+            call('file.seccomp', os.path.join(self.meta_dir,
+                 'file.seccomp')),
         ])
 
     @patch('snapcraft.meta._write_wrap_exe')
     @patch('snapcraft.meta.open', create=True)
-    def test_create_meta_with_vararg_config(self, mock_the_open, mock_wrap_exe):
+    def test_create_meta_with_vararg_config(self, mock_the_open,
+                                            mock_wrap_exe):
         self.config_data['config'] = 'python3 my.py --config'
 
         meta.create(self.config_data, ['amd64'])
@@ -294,7 +305,8 @@
         mock_wrap_exe.assert_has_calls([
             call(
                 '$SNAP_APP_PATH/bin/bash',
-                os.path.join(os.path.abspath(os.curdir), 'snap/bin/bash.wrapper'),
+                os.path.join(os.path.abspath(os.curdir),
+                             'snap/bin/bash.wrapper'),
             ),
             call(
                 'python3',
@@ -311,7 +323,8 @@
 
         meta.create(self.config_data, ['amd64'])
 
-        self.mock_makedirs.assert_called_once_with(self.meta_dir, exist_ok=True)
+        self.mock_makedirs.assert_called_once_with(self.meta_dir,
+                                                   exist_ok=True)
         mock_the_open.assert_has_calls(self.expected_open_calls)
 
 
 
=== modified file 'snapcraft/tests/test_plugin.py'
--- snapcraft/tests/test_plugin.py	2015-09-22 03:51:37 +0000
+++ snapcraft/tests/test_plugin.py	2015-10-05 19:37:43 +0000
@@ -76,7 +76,8 @@
 
         include, exclude = plugin._get_file_list(stage_set)
 
-        self.assertEqual(include, ['opt/something', 'usr/bin', '-everything', r'\a'])
+        self.assertEqual(include, ['opt/something', 'usr/bin',
+                                   '-everything', r'\a'])
         self.assertEqual(exclude, ['etc', 'usr/lib/*.a'])
 
     def test_fileset_only_includes(self):
@@ -182,7 +183,8 @@
                 dstdir = tmpdir + '/stage'
                 os.makedirs(dstdir)
 
-                snap_files, snap_dirs = plugin.migratable_filesets(filesets[key]['fileset'], srcdir)
+                snap_files, snap_dirs = plugin.migratable_filesets(
+                    filesets[key]['fileset'], srcdir)
                 plugin._migrate_files(snap_files, snap_dirs, srcdir, dstdir)
 
                 expected = []
 
=== modified file 'snapcraft/tests/test_repo.py'
--- snapcraft/tests/test_repo.py	2015-09-23 14:24:04 +0000
+++ snapcraft/tests/test_repo.py	2015-10-05 19:37:43 +0000
@@ -31,7 +31,8 @@
         sources_list = repo._format_sources_list(
             repo._DEFAULT_SOURCES, 'amd64', 'vivid')
 
-        expected_sources_list = '''deb http://ar.archive.ubuntu.com/ubuntu/ vivid main restricted
+        expected_sources_list = \
+            '''deb http://ar.archive.ubuntu.com/ubuntu/ vivid main restricted
 deb http://ar.archive.ubuntu.com/ubuntu/ vivid-updates main restricted
 deb http://ar.archive.ubuntu.com/ubuntu/ vivid universe
 deb http://ar.archive.ubuntu.com/ubuntu/ vivid-updates universe
@@ -48,7 +49,8 @@
         sources_list = repo._format_sources_list(
             repo._DEFAULT_SOURCES, 'armhf', 'trusty')
 
-        expected_sources_list = '''deb http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted
+        expected_sources_list = \
+            '''deb http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted
 deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted
 deb http://ports.ubuntu.com/ubuntu-ports/ trusty universe
 deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates universe
 
=== modified file 'snapcraft/tests/test_sources.py'
--- snapcraft/tests/test_sources.py	2015-09-01 09:58:55 +0000
+++ snapcraft/tests/test_sources.py	2015-10-05 19:37:43 +0000
@@ -98,7 +98,8 @@
         bzr.pull()
 
         self.mock_run.assert_called_once_with(
-            ['bzr', 'branch', '-r', 'tag:tag', 'lp:my-source', 'source_dir'], cwd=os.getcwd())
+            ['bzr', 'branch', '-r', 'tag:tag', 'lp:my-source',
+             'source_dir'], cwd=os.getcwd())
 
     def test_pull_existing_with_tag(self):
         self.mock_path_exists.return_value = True
@@ -107,7 +108,8 @@
         bzr.pull()
 
         self.mock_run.assert_called_once_with(
-            ['bzr', 'pull', '-r', 'tag:tag', 'lp:my-source', '-d', 'source_dir'], cwd=os.getcwd())
+            ['bzr', 'pull', '-r', 'tag:tag', 'lp:my-source', '-d',
+             'source_dir'], cwd=os.getcwd())
 
     def test_provision(self):
         bzr = sources.Bazaar('lp:my-source', 'source_dir')
@@ -135,18 +137,21 @@
             ['git', 'clone', 'git://my-source', 'source_dir'], cwd=os.getcwd())
 
     def test_pull_branch(self):
-        git = sources.Git('git://my-source', 'source_dir', source_branch='my-branch')
+        git = sources.Git('git://my-source', 'source_dir',
+                          source_branch='my-branch')
         git.pull()
 
         self.mock_run.assert_called_once_with(
-            ['git', 'clone', '--branch', 'my-branch', 'git://my-source', 'source_dir'], cwd=os.getcwd())
+            ['git', 'clone', '--branch', 'my-branch', 'git://my-source',
+             'source_dir'], cwd=os.getcwd())
 
     def test_pull_tag(self):
         git = sources.Git('git://my-source', 'source_dir', source_tag='tag')
         git.pull()
 
         self.mock_run.assert_called_once_with(
-            ['git', 'clone', '--branch', 'tag', 'git://my-source', 'source_dir'], cwd=os.getcwd())
+            ['git', 'clone', '--branch', 'tag', 'git://my-source',
+             'source_dir'], cwd=os.getcwd())
 
     def test_pull_existing(self):
         self.mock_path_exists.return_value = True
@@ -155,7 +160,8 @@
         git.pull()
 
         self.mock_run.assert_called_once_with(
-            ['git', '-C', 'source_dir', 'pull', 'git://my-source', 'HEAD'], cwd=os.getcwd())
+            ['git', '-C', 'source_dir', 'pull', 'git://my-source',
+             'HEAD'], cwd=os.getcwd())
 
     def test_pull_existing_with_tag(self):
         self.mock_path_exists.return_value = True
@@ -164,16 +170,19 @@
         git.pull()
 
         self.mock_run.assert_called_once_with(
-            ['git', '-C', 'source_dir', 'pull', 'git://my-source', 'refs/tags/tag'], cwd=os.getcwd())
+            ['git', '-C', 'source_dir', 'pull', 'git://my-source',
+             'refs/tags/tag'], cwd=os.getcwd())
 
     def test_pull_existing_with_branch(self):
         self.mock_path_exists.return_value = True
 
-        git = sources.Git('git://my-source', 'source_dir', source_branch='my-branch')
+        git = sources.Git('git://my-source', 'source_dir',
+                          source_branch='my-branch')
         git.pull()
 
         self.mock_run.assert_called_once_with(
-            ['git', '-C', 'source_dir', 'pull', 'git://my-source', 'refs/heads/my-branch'], cwd=os.getcwd())
+            ['git', '-C', 'source_dir', 'pull', 'git://my-source',
+             'refs/heads/my-branch'], cwd=os.getcwd())
 
     def test_provision(self):
         bzr = sources.Git('git://my-source', 'source_dir')
@@ -184,9 +193,11 @@
 
     def test_init_with_source_branch_and_tag_raises_exception(self):
         with self.assertRaises(sources.IncompatibleOptionsError) as raised:
-            sources.Git('git://mysource', 'source_dir', source_tag='tag', source_branch='branch')
+            sources.Git('git://mysource', 'source_dir', source_tag='tag',
+                        source_branch='branch')
 
-        expected_message = 'can\'t specify both source-tag and source-branch for a git source'
+        expected_message = \
+            'can\'t specify both source-tag and source-branch for a git source'
         self.assertEqual(raised.exception.message, expected_message)
 
 
@@ -200,18 +211,22 @@
             ['hg', 'clone', 'hg://my-source', 'source_dir'], cwd=os.getcwd())
 
     def test_pull_branch(self):
-        hg = sources.Mercurial('hg://my-source', 'source_dir', source_branch='my-branch')
+        hg = sources.Mercurial('hg://my-source', 'source_dir',
+                               source_branch='my-branch')
         hg.pull()
 
         self.mock_run.assert_called_once_with(
-            ['hg', 'clone', '-u', 'my-branch', 'hg://my-source', 'source_dir'], cwd=os.getcwd())
+            ['hg', 'clone', '-u', 'my-branch', 'hg://my-source',
+             'source_dir'], cwd=os.getcwd())
 
     def test_pull_tag(self):
-        hg = sources.Mercurial('hg://my-source', 'source_dir', source_tag='tag')
+        hg = sources.Mercurial('hg://my-source', 'source_dir',
+                               source_tag='tag')
         hg.pull()
 
         self.mock_run.assert_called_once_with(
-            ['hg', 'clone', '-u', 'tag', 'hg://my-source', 'source_dir'], cwd=os.getcwd())
+            ['hg', 'clone', '-u', 'tag', 'hg://my-source',
+             'source_dir'], cwd=os.getcwd())
 
     def test_pull_existing(self):
         self.mock_path_exists.return_value = True
@@ -225,7 +240,8 @@
     def test_pull_existing_with_tag(self):
         self.mock_path_exists.return_value = True
 
-        hg = sources.Mercurial('hg://my-source', 'source_dir', source_tag='tag')
+        hg = sources.Mercurial('hg://my-source', 'source_dir',
+                               source_tag='tag')
         hg.pull()
 
         self.mock_run.assert_called_once_with(
@@ -234,11 +250,13 @@
     def test_pull_existing_with_branch(self):
         self.mock_path_exists.return_value = True
 
-        hg = sources.Mercurial('hg://my-source', 'source_dir', source_branch='my-branch')
+        hg = sources.Mercurial('hg://my-source', 'source_dir',
+                               source_branch='my-branch')
         hg.pull()
 
         self.mock_run.assert_called_once_with(
-            ['hg', 'pull', '-b', 'my-branch', 'hg://my-source'], cwd=os.getcwd())
+            ['hg', 'pull', '-b', 'my-branch', 'hg://my-source'],
+            cwd=os.getcwd())
 
     def test_provision(self):
         bzr = sources.Mercurial('hg://my-source', 'source_dir')
@@ -249,9 +267,12 @@
 
     def test_init_with_source_branch_and_tag_raises_exception(self):
         with self.assertRaises(sources.IncompatibleOptionsError) as raised:
-            sources.Mercurial('hg://mysource', 'source_dir', source_tag='tag', source_branch='branch')
+            sources.Mercurial('hg://mysource', 'source_dir', source_tag='tag',
+                              source_branch='branch')
 
-        expected_message = 'can\'t specify both source-tag and source-branch for a mercurial source'
+        expected_message = (
+            'can\'t specify both source-tag and source-branch for a mercurial '
+            'source')
         self.assertEqual(raised.exception.message, expected_message)
 
 
@@ -288,7 +309,8 @@
         local.provision('dst')
 
         self.mock_rmdir.assert_called_once_with('dst')
-        self.mock_symlink.assert_called_once_with('/home/ubuntu/sources/snap/source', 'dst')
+        self.mock_symlink.assert_called_once_with(
+            '/home/ubuntu/sources/snap/source', 'dst')
 
     def test_provision_when_target_is_file(self):
         self.mock_isdir.return_value = False
@@ -297,4 +319,5 @@
         local.provision('dst')
 
         self.mock_remove.assert_called_once_with('dst')
-        self.mock_symlink.assert_called_once_with('/home/ubuntu/sources/snap/source', 'dst')
+        self.mock_symlink.assert_called_once_with(
+            '/home/ubuntu/sources/snap/source', 'dst')
 
=== modified file 'snapcraft/tests/test_yaml.py'
--- snapcraft/tests/test_yaml.py	2015-10-01 08:54:15 +0000
+++ snapcraft/tests/test_yaml.py	2015-10-05 19:37:43 +0000
@@ -101,7 +101,8 @@
         self.useFixture(fake_logger)
 
         # no snapcraft.yaml
-        with self.assertRaises(snapcraft.yaml.SnapcraftYamlFileError) as raised:
+        with self.assertRaises(
+                snapcraft.yaml.SnapcraftYamlFileError) as raised:
             snapcraft.yaml.Config()
 
         self.assertEqual(raised.exception.file, 'snapcraft.yaml')
@@ -130,7 +131,9 @@
         with self.assertRaises(snapcraft.yaml.SnapcraftLogicError) as raised:
             snapcraft.yaml.Config()
 
-        self.assertEqual(raised.exception.message, 'circular dependency chain found in parts definition')
+        self.assertEqual(
+            raised.exception.message,
+            'circular dependency chain found in parts definition')
         self.assertFalse(self.mock_wiki.get_part.called)
 
     @unittest.mock.patch('snapcraft.yaml.Config.load_plugin')
@@ -153,7 +156,8 @@
         with self.assertRaises(snapcraft.yaml.SnapcraftSchemaError) as raised:
             snapcraft.yaml.Config()
 
-        self.assertEqual(raised.exception.message, '\'name\' is a required property')
+        self.assertEqual(raised.exception.message,
+                         '\'name\' is a required property')
 
     @unittest.mock.patch('snapcraft.yaml.Config.load_plugin')
     def test_invalid_yaml_invalid_name_as_number(self, mock_loadPlugin):
@@ -175,7 +179,8 @@
         with self.assertRaises(snapcraft.yaml.SnapcraftSchemaError) as raised:
             snapcraft.yaml.Config()
 
-        self.assertEqual(raised.exception.message, '1 is not of type \'string\'')
+        self.assertEqual(raised.exception.message,
+                         '1 is not of type \'string\'')
 
     @unittest.mock.patch('snapcraft.yaml.Config.load_plugin')
     def test_invalid_yaml_invalid_name_chars(self, mock_loadPlugin):
@@ -197,7 +202,9 @@
         with self.assertRaises(snapcraft.yaml.SnapcraftSchemaError) as raised:
             snapcraft.yaml.Config()
 
-        self.assertEqual(raised.exception.message, '\'myapp@me_1.0\' does not match \'^[a-z0-9][a-z0-9+-]*$\'')
+        self.assertEqual(
+            raised.exception.message,
+            '\'myapp@me_1.0\' does not match \'^[a-z0-9][a-z0-9+-]*$\'')
 
     @unittest.mock.patch('snapcraft.yaml.Config.load_plugin')
     def test_deprecation_for_type(self, mock_loadPlugin):
@@ -240,7 +247,9 @@
         with self.assertRaises(snapcraft.yaml.SnapcraftSchemaError) as raised:
             snapcraft.yaml.Config()
 
-        self.assertEqual(raised.exception.message, '\'description\' is a required property')
+        self.assertEqual(
+            raised.exception.message,
+            '\'description\' is a required property')
 
     @unittest.mock.patch('snapcraft.yaml.Config.load_plugin')
     def test_tab_in_yaml(self, mock_loadPlugin):
@@ -296,7 +305,8 @@
         snapcraft.yaml.Config()
 
         mock_loadPlugin.assert_called_with('part1', 'go', {
-            'snap': ['/usr/lib/wget.so', '/usr/bin/wget', '/usr/share/my-icon.png'],
+            'snap': ['/usr/lib/wget.so', '/usr/bin/wget',
+                     '/usr/share/my-icon.png'],
             'stage-packages': ['fswebcam'],
             'stage': ['/usr/lib/wget.so', '/usr/bin/wget', '/usr/lib/wget.a'],
         })
@@ -333,11 +343,13 @@
             with self.subTest(key=key):
                 del data[key]
 
-                with self.assertRaises(snapcraft.yaml.SnapcraftSchemaError) as raised:
+                with self.assertRaises(
+                        snapcraft.yaml.SnapcraftSchemaError) as raised:
                     snapcraft.yaml._validate_snapcraft_yaml(data)
 
                 expected_message = '\'{}\' is a required property'.format(key)
-                self.assertEqual(raised.exception.message, expected_message, msg=data)
+                self.assertEqual(raised.exception.message, expected_message,
+                                 msg=data)
 
     def test_invalid_names(self):
         invalid_names = [
@@ -351,11 +363,15 @@
             with self.subTest(key=name):
                 data['name'] = name
 
-                with self.assertRaises(snapcraft.yaml.SnapcraftSchemaError) as raised:
+                with self.assertRaises(
+                        snapcraft.yaml.SnapcraftSchemaError) as raised:
                     snapcraft.yaml._validate_snapcraft_yaml(data)
 
-                expected_message = '\'{}\' does not match \'^[a-z0-9][a-z0-9+-]*$\''.format(name)
-                self.assertEqual(raised.exception.message, expected_message, msg=data)
+                expected_message = (
+                    '\'{}\' does not match \'^[a-z0-9][a-z0-9+-]*$\'').format(
+                    name)
+                self.assertEqual(raised.exception.message, expected_message,
+                                 msg=data)
 
     def test_summary_too_long(self):
         self.data['summary'] = 'a' * 80
@@ -363,7 +379,8 @@
             snapcraft.yaml._validate_snapcraft_yaml(self.data)
 
         expected_message = '\'{}\' is too long'.format(self.data['summary'])
-        self.assertEqual(raised.exception.message, expected_message, msg=self.data)
+        self.assertEqual(raised.exception.message, expected_message,
+                         msg=self.data)
 
     def test_valid_types(self):
         self.data['type'] = 'app'
@@ -386,11 +403,14 @@
             with self.subTest(key=t):
                 data['type'] = t
 
-                with self.assertRaises(snapcraft.yaml.SnapcraftSchemaError) as raised:
+                with self.assertRaises(
+                        snapcraft.yaml.SnapcraftSchemaError) as raised:
                     snapcraft.yaml._validate_snapcraft_yaml(data)
 
-                expected_message = '\'{}\' is not one of [\'app\', \'framework\']'.format(t)
-                self.assertEqual(raised.exception.message, expected_message, msg=data)
+                expected_message = ('\'{}\' is not one of ' +
+                                    '[\'app\', \'framework\']').format(t)
+                self.assertEqual(raised.exception.message, expected_message,
+                                 msg=data)
 
     def test_valid_services(self):
         self.data['services'] = {
@@ -416,11 +436,14 @@
             with self.subTest(key=t):
                 data['binaries'] = {t: invalid_names[t]}
 
-                with self.assertRaises(snapcraft.yaml.SnapcraftSchemaError) as raised:
+                with self.assertRaises(
+                        snapcraft.yaml.SnapcraftSchemaError) as raised:
                     snapcraft.yaml._validate_snapcraft_yaml(data)
 
-                expected_message = 'Additional properties are not allowed (\'{}\' was unexpected)'.format(t)
-                self.assertEqual(raised.exception.message, expected_message, msg=data)
+                expected_message = ('Additional properties are not allowed '
+                                    '(\'{}\' was unexpected)').format(t)
+                self.assertEqual(raised.exception.message, expected_message,
+                                 msg=data)
 
     def test_invalid_service_names(self):
         invalid_names = {
@@ -435,11 +458,14 @@
             with self.subTest(key=t):
                 data['services'] = {t: invalid_names[t]}
 
-                with self.assertRaises(snapcraft.yaml.SnapcraftSchemaError) as raised:
+                with self.assertRaises(
+                        snapcraft.yaml.SnapcraftSchemaError) as raised:
                     snapcraft.yaml._validate_snapcraft_yaml(data)
 
-                expected_message = 'Additional properties are not allowed (\'{}\' was unexpected)'.format(t)
-                self.assertEqual(raised.exception.message, expected_message, msg=data)
+                expected_message = ('Additional properties are not allowed '
+                                    '(\'{}\' was unexpected)').format(t)
+                self.assertEqual(raised.exception.message, expected_message,
+                                 msg=data)
 
     def test_services_required_properties(self):
         self.data['services'] = {'service1': {}}
@@ -448,19 +474,24 @@
             snapcraft.yaml._validate_snapcraft_yaml(self.data)
 
         expected_message = '\'start\' is a required property'
-        self.assertEqual(raised.exception.message, expected_message, msg=self.data)
+        self.assertEqual(raised.exception.message, expected_message,
+                         msg=self.data)
 
     def test_schema_file_not_found(self):
         mock_the_open = unittest.mock.mock_open()
         mock_the_open.side_effect = FileNotFoundError()
 
-        with unittest.mock.patch('snapcraft.yaml.open', mock_the_open, create=True):
-            with self.assertRaises(snapcraft.yaml.SnapcraftSchemaError) as raised:
+        with unittest.mock.patch('snapcraft.yaml.open', mock_the_open,
+                                 create=True):
+            with self.assertRaises(
+                    snapcraft.yaml.SnapcraftSchemaError) as raised:
                 snapcraft.yaml._validate_snapcraft_yaml(self.data)
 
-        expected_path = os.path.join(snapcraft.common.get_schemadir(), 'snapcraft.yaml')
+        expected_path = os.path.join(snapcraft.common.get_schemadir(),
+                                     'snapcraft.yaml')
         mock_the_open.assert_called_once_with(expected_path)
-        expected_message = 'snapcraft validation file is missing from installation path'
+        expected_message = ('snapcraft validation file is missing from '
+                            'installation path')
         self.assertEqual(raised.exception.message, expected_message)
 
     def test_icon_missing(self):
@@ -470,7 +501,8 @@
             snapcraft.yaml._validate_snapcraft_yaml(self.data)
 
         expected_message = '\'my-icon.png\' is not a \'icon-path\''
-        self.assertEqual(raised.exception.message, expected_message, msg=self.data)
+        self.assertEqual(raised.exception.message, expected_message,
+                         msg=self.data)
 
 
 class TestFilesets(TestCase):
 
=== modified file 'snapcraft/yaml.py'
--- snapcraft/yaml.py	2015-10-02 18:25:33 +0000
+++ snapcraft/yaml.py	2015-10-05 19:37:43 +0000
@@ -145,14 +145,16 @@
                         present = True
                         break
                 if not present:
-                    new_parts.append(self.load_plugin(required_part, required_part, {}))
+                    new_parts.append(self.load_plugin(required_part,
+                                                      required_part, {}))
 
     def _compute_part_dependencies(self, after_requests):
         '''Gather the lists of dependencies and adds to all_parts.'''
         w = snapcraft.wiki.Wiki()
 
         for part in self.all_parts:
-            dep_names = part.config.get('requires', []) + after_requests.get(part.names()[0], [])
+            dep_names = part.config.get('requires', []) + \
+                after_requests.get(part.names()[0], [])
             for dep in dep_names:
                 found = False
                 for i in range(len(self.all_parts)):
@@ -164,9 +166,11 @@
                     wiki_part = w.get_part(dep)
                     found = True if wiki_part else False
                     if found:
-                        part.deps.append(self.load_plugin(dep, wiki_part['plugin'], wiki_part))
+                        part.deps.append(self.load_plugin(
+                            dep, wiki_part['plugin'], wiki_part))
                 if not found:
-                    raise SnapcraftLogicError('part name missing {}'.format(dep))
+                    raise SnapcraftLogicError(
+                        'part name missing {}'.format(dep))
 
     def _sort_parts(self):
         '''Performs an inneficient but easy to follow sorting of parts.'''
@@ -184,14 +188,16 @@
                     top_part = part
                     break
             if not top_part:
-                raise SnapcraftLogicError('circular dependency chain found in parts definition')
+                raise SnapcraftLogicError(
+                    'circular dependency chain found in parts definition')
             sorted_parts = [top_part] + sorted_parts
             self.all_parts.remove(top_part)
 
         return sorted_parts
 
     def load_plugin(self, part_name, plugin_name, properties, load_code=True):
-        part = snapcraft.plugin.load_plugin(part_name, plugin_name, properties, load_code=load_code)
+        part = snapcraft.plugin.load_plugin(part_name, plugin_name,
+                                            properties, load_code=load_code)
 
         self.build_tools += part.config.get('build-packages', [])
         self.all_parts.append(part)
@@ -280,15 +286,18 @@
 
 
 def _validate_snapcraft_yaml(snapcraft_yaml):
-    schema_file = os.path.abspath(os.path.join(common.get_schemadir(), 'snapcraft.yaml'))
+    schema_file = os.path.abspath(os.path.join(common.get_schemadir(),
+                                               'snapcraft.yaml'))
 
     try:
         with open(schema_file) as fp:
             schema = yaml.load(fp)
             format_check = jsonschema.FormatChecker()
-            jsonschema.validate(snapcraft_yaml, schema, format_checker=format_check)
+            jsonschema.validate(snapcraft_yaml, schema,
+                                format_checker=format_check)
     except FileNotFoundError:
-        raise SnapcraftSchemaError('snapcraft validation file is missing from installation path')
+        raise SnapcraftSchemaError(
+            'snapcraft validation file is missing from installation path')
     except jsonschema.ValidationError as e:
         raise SnapcraftSchemaError(e.message)