config: flake8 clean

1 files changed, 309 insertions, 306 deletions

diff --git a/gbp/config.py b/gbp/config.py
index 4e1581e7..3380cc89 100644
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -1,4 +1,4 @@
-# vim: set fileencoding=utf-8 :
+# vim: set fileencoding=utf-8:
 #
 # (C) 2006,2007,2010-2012,2015,2016 Guido Guenther <agx@sigxcpu.org>
 #    This program is free software; you can redistribute it and/or modify
@@ -39,10 +39,12 @@ file:///usr/share/doc/git-buildpackage/manual-html/gbp.import.html#GBP.IMPORT.CO
 on howto create it otherwise use --upstream-branch to specify it.
 """
 
+
 def expand_path(option, opt, value):
     value = os.path.expandvars(value)
     return os.path.expanduser(value)
 
+
 def check_tristate(option, opt, value):
     try:
         val = gbp.tristate.Tristate(value)
@@ -79,6 +81,7 @@ class GbpOption(Option):
     TYPE_CHECKER['path'] = expand_path
     TYPE_CHECKER['tristate'] = check_tristate
 
+
 class GbpOptionParser(OptionParser):
     """
     Handles commandline options and parsing of config files
@@ -96,260 +99,260 @@ class GbpOptionParser(OptionParser):
     @cvar def_config_files: config files we parse
     @type def_config_files: dict (type, path)
     """
-    defaults = { 'debian-branch'   : 'master',
-                 'upstream-branch' : 'upstream',
-                 'upstream-tree'   : 'TAG',
-                 'pq-from'         : 'DEBIAN',
-                 'pristine-tar'    : 'False',
-                 'pristine-tar-commit': 'False',
-                 'filter-pristine-tar' : 'False',
-                 'sign-tags'       : 'False',
-                 'force-create'    : 'False',
-                 'no-create-orig'  : 'False',
-                 'cleaner'         : '/bin/true',
-                 'keyid'           : '',
-                 'posttag'         : '',
-                 'postbuild'       : '',
-                 'prebuild'        : '',
-                 'postclone'       : '',
-                 'postexport'      : '',
-                 'postimport'      : '',
-                 'hooks'           : 'True',
-                 'debian-tag'      : 'debian/%(version)s',
-                 'debian-tag-msg'  : '%(pkg)s Debian release %(version)s',
-                 'upstream-tag'    : 'upstream/%(version)s',
-                 'import-msg'      : 'New upstream version %(version)s',
-                 'commit-msg'      : 'Update changelog for %(version)s release',
-                 'filter'          : [],
-                 'snapshot-number' : 'snapshot + 1',
-                 'git-log'         : '--no-merges',
-                 'export'          : 'HEAD',
-                 'export-dir'      : '',
-                 'overlay'         : 'False',
-                 'tarball-dir'     : '',
-                 'ignore-new'      : 'False',
-                 'ignore-branch'   : 'False',
-                 'meta'            : 'True',
-                 'meta-closes'     : 'Closes|LP',
-                 'meta-closes-bugnum'  : r'(?:bug|issue)?\#?\s?\d+',
-                 'full'            : 'False',
-                 'id-length'       : '0',
-                 'git-author'      : 'False',
-                 'ignore-regex'    : '',
-                 'compression'     : 'auto',
-                 'compression-level': '9',
-                 'remote-url-pattern' : 'ssh://git.debian.org/git/collab-maint/%(pkg)s.git',
-                 'multimaint'      : 'True',
-                 'multimaint-merge': 'False',
-                 'pbuilder'        : 'False',
-                 'qemubuilder'     : 'False',
-                 'dist'            : 'sid',
-                 'arch'            : '',
-                 'interactive'     : 'True',
-                 'color'           : 'auto',
-                 'color-scheme'   : '',
-                 'customizations'  : '',
-                 'spawn-editor'    : 'release',
-                 'patch-numbers'   : 'True',
-                 'patch-num-format': '%04d-',
-                 'renumber'        : 'False',
-                 'notify'          : 'auto',
-                 'merge'           : 'True',
-                 'merge-mode'      : 'merge',
-                 'track'           : 'True',
-                 'author-is-committer': 'False',
-                 'author-date-is-committer-date': 'False',
-                 'create-missing-branches': 'False',
-                 'submodules'      : 'False',
-                 'time-machine'    : 1,
-                 'pbuilder-autoconf' : 'True',
-                 'pbuilder-options': '',
-                 'template-dir': '',
-                 'remote-config': '',
-                 'allow-unauthenticated': 'False',
-                 'symlink-orig': 'True',
-                 'purge': 'True',
-                 'drop': 'False',
-                 'commit': 'False',
-                 'upstream-vcs-tag': '',
-                 'rollback': 'True',
-                 'component': [],
-                 'bare': 'True',
-             }
+    defaults = {'debian-branch': 'master',
+                'upstream-branch': 'upstream',
+                'upstream-tree': 'TAG',
+                'pq-from': 'DEBIAN',
+                'pristine-tar': 'False',
+                'pristine-tar-commit': 'False',
+                'filter-pristine-tar': 'False',
+                'sign-tags': 'False',
+                'force-create': 'False',
+                'no-create-orig': 'False',
+                'cleaner': '/bin/true',
+                'keyid': '',
+                'posttag': '',
+                'postbuild': '',
+                'prebuild': '',
+                'postclone': '',
+                'postexport': '',
+                'postimport': '',
+                'hooks': 'True',
+                'debian-tag': 'debian/%(version)s',
+                'debian-tag-msg': '%(pkg)s Debian release %(version)s',
+                'upstream-tag': 'upstream/%(version)s',
+                'import-msg': 'New upstream version %(version)s',
+                'commit-msg': 'Update changelog for %(version)s release',
+                'filter': [],
+                'snapshot-number': 'snapshot + 1',
+                'git-log': '--no-merges',
+                'export': 'HEAD',
+                'export-dir': '',
+                'overlay': 'False',
+                'tarball-dir': '',
+                'ignore-new': 'False',
+                'ignore-branch': 'False',
+                'meta': 'True',
+                'meta-closes': 'Closes|LP',
+                'meta-closes-bugnum': r'(?:bug|issue)?\#?\s?\d+',
+                'full': 'False',
+                'id-length': '0',
+                'git-author': 'False',
+                'ignore-regex': '',
+                'compression': 'auto',
+                'compression-level': '9',
+                'remote-url-pattern': 'ssh://git.debian.org/git/collab-maint/%(pkg)s.git',
+                'multimaint': 'True',
+                'multimaint-merge': 'False',
+                'pbuilder': 'False',
+                'qemubuilder': 'False',
+                'dist': 'sid',
+                'arch': '',
+                'interactive': 'True',
+                'color': 'auto',
+                'color-scheme': '',
+                'customizations': '',
+                'spawn-editor': 'release',
+                'patch-numbers': 'True',
+                'patch-num-format': '%04d-',
+                'renumber': 'False',
+                'notify': 'auto',
+                'merge': 'True',
+                'merge-mode': 'merge',
+                'track': 'True',
+                'author-is-committer': 'False',
+                'author-date-is-committer-date': 'False',
+                'create-missing-branches': 'False',
+                'submodules': 'False',
+                'time-machine': 1,
+                'pbuilder-autoconf': 'True',
+                'pbuilder-options': '',
+                'template-dir': '',
+                'remote-config': '',
+                'allow-unauthenticated': 'False',
+                'symlink-orig': 'True',
+                'purge': 'True',
+                'drop': 'False',
+                'commit': 'False',
+                'upstream-vcs-tag': '',
+                'rollback': 'True',
+                'component': [],
+                'bare': 'True',
+                }
     help = {
-             'debian-branch':
-                  ("Branch the Debian package is being developed on, "
-                   "default is '%(debian-branch)s'"),
-             'upstream-branch':
-                  "Upstream branch, default is '%(upstream-branch)s'",
-             'upstream-tree':
-                  ("Where to generate the upstream tarball from "
-                   "(tag or branch), default is '%(upstream-tree)s'"),
-             'pq-from':
-                  ("How to find the patch queue base. DEBIAN or TAG, "
-                   "the default is '%(pq-from)s'"),
-             'debian-tag':
-                  ("Format string for debian tags, "
-                   "default is '%(debian-tag)s'"),
-             'debian-tag-msg':
-                  ("Format string for signed debian-tag messages, "
-                   "default is '%(debian-tag-msg)s'"),
-             'upstream-tag':
-                  ("Format string for upstream tags, "
-                   "default is '%(upstream-tag)s'"),
-             'sign-tags':
-                  "Whether to sign tags, default is '%(sign-tags)s'",
-             'keyid':
-                  "GPG keyid to sign tags with, default is '%(keyid)s'",
-             'import-msg':
-                  ("Format string for commit message used to commit "
-                   "the upstream tarball, default is '%(import-msg)s'"),
-             'commit-msg':
-                  ("Format string for commit messag used to commit, "
-                   "the changelog, default is '%(commit-msg)s'"),
-             'pristine-tar':
-                  ("Use pristine-tar to create orig tarball, "
-                   "default is '%(pristine-tar)s'"),
-             'pristine-tar-commit':
-                  ("When generating a tarball commit it to the pristine-tar branch '%(pristine-tar-commit)s' "
-                   "default is '%(pristine-tar-commit)s'"),
-             'filter-pristine-tar':
-                  "Filter pristine-tar when filter option is used, default is '%(filter-pristine-tar)s'",
-             'filter':
-                  "Files to filter out during import (can be given multiple times), default is %(filter)s",
-             'git-author':
-                  "Use name and email from git-config for changelog trailer, default is '%(git-author)s'",
-             'full':
-                  "Include the full commit message instead of only the first line, default is '%(full)s'",
-             'meta':
-                  "Parse meta tags in commit messages, default is '%(meta)s'",
-             'meta-closes':
-                  "Meta tags for the bts close commands, default is '%(meta-closes)s'",
-             'meta-closes-bugnum':
-                  "Meta bug number format, default is '%(meta-closes-bugnum)s'",
-             'ignore-new':
-                  "Build with uncommitted changes in the source tree, default is '%(ignore-new)s'",
-             'ignore-branch':
-                  ("Build although debian-branch != current branch, "
-                   "default is '%(ignore-branch)s'"),
-             'overlay':
-                  ("extract orig tarball when using export-dir option, "
-                   "default is '%(overlay)s'"),
-             'remote-url-pattern':
-                  ("Remote url pattern to create the repo at, "
-                   "default is '%(remote-url-pattern)s'"),
-             'multimaint':
-                  "Note multiple maintainers, default is '%(multimaint)s'",
-             'multimaint-merge':
-                  ("Merge commits by maintainer, "
-                   "default is '%(multimaint-merge)s'"),
-             'pbuilder':
-                  ("Invoke git-pbuilder for building, "
-                   "default is '%(pbuilder)s'"),
-             'dist':
-                  ("Build for this distribution when using git-pbuilder, "
-                   "default is '%(dist)s'"),
-             'arch':
-                  ("Build for this architecture when using git-pbuilder, "
-                   "default is '%(arch)s'"),
-             'qemubuilder':
-                  ("Invoke git-pbuilder with qemubuilder for building, "
-                   "default is '%(qemubuilder)s'"),
-             'interactive':
-                  "Run command interactively, default is '%(interactive)s'",
-             'color':
-                  "Whether to use colored output, default is '%(color)s'",
-             'color-scheme':
-                  ("Colors to use in output (when color is enabled), format "
-                   "is '<debug>:<info>:<warning>:<error>', e.g. "
-                   "'cyan:34::'. Numerical values and color names are "
-                   "accepted, empty fields indicate using the default."),
-             'spawn-editor':
-                  ("Whether to spawn an editor after adding the "
-                   "changelog entry, default is '%(spawn-editor)s'"),
-             'patch-numbers':
-                  ("Whether to number patch files, "
-                   "default is %(patch-numbers)s"),
-             'patch-num-format':
-                  ("The format specifier for patch number prefixes, "
-                   "default is %(patch-num-format)s"),
-             'renumber':
-                  ("Whether to renumber patches exported from patch queues, "
-                   "instead of preserving the number specified in "
-                   "'Gbp-Pq: Name' tags, default is %(renumber)s"),
-             'notify':
-                  ("Whether to send a desktop notification after the build, "
-                   "default is '%(notify)s'"),
-             'merge':
-                  ("After the import merge the result to the debian branch, "
-                   "default is '%(merge)s'"),
-             'merge-mode':
-                  ("Howto merge the new upstream sources onto the debian branch"
-                   "default is '%(merge-mode)s'"),
-             'track':
-                  ("Set up tracking for remote branches, "
-                   "default is '%(track)s'"),
-             'author-is-committer':
-                  ("Use the authors's name also as the committer's name, "
-                   "default is '%(author-is-committer)s'"),
-             'author-date-is-committer-date':
-                  ("Use the authors's date as the committer's date, "
-                   "default is '%(author-date-is-committer-date)s'"),
-             'create-missing-branches':
-                  ("Create missing branches automatically, "
-                   "default is '%(create-missing-branches)s'"),
-             'submodules':
-                  ("Transparently handle submodules in the upstream tree, "
-                   "default is '%(submodules)s'"),
-             'postimport':
-                  ("hook run after a successful import, "
-                   "default is '%(postimport)s'"),
-             'hooks':
-                  ("Enable running all hooks, default is %(hooks)s"),
-             'time-machine':
-                  ("don't try head commit only to apply the patch queue "
-                   "but look TIME_MACHINE commits back, "
-                   "default is '%(time-machine)d'"),
-             'pbuilder-autoconf':
-                  ("Whether to configure pbuilder automatically, "
-                   "default is '%(pbuilder-autoconf)s'"),
-             'pbuilder-options':
-                  ("Options to pass to pbuilder, "
-                   "default is '%(pbuilder-options)s'"),
-             'template-dir':
-                  ("Template directory used by git init, "
-                   "default is '%(template-dir)s'"),
-             'remote-config':
-                  ("Remote defintion in gbp.conf used to create the remote "
-                   "repository, default is '%(remote-config)s'"),
-             'allow-unauthenticated':
-                  ("Don't verify integrity of downloaded source, "
-                   "default is '%(allow-unauthenticated)s'"),
-             'symlink-orig':
-                  ("Whether to creat a symlink from the upstream tarball "
-                   "to the orig.tar.gz if needed, default is "
-                   "'%(symlink-orig)s'"),
-              'purge':
-                  "Purge exported package build directory. Default is '%(purge)s'",
-              'drop':
-                  ("In case of 'export' drop the patch-queue branch "
-                   "after export. Default is '%(drop)s'"),
-              'commit':
-                  "commit changes after export, Default is '%(commit)s'",
-              'rollback':
-                  "Rollback repository changes when encountering an error",
-              'component':
-                  'component name for additional tarballs',
-              'bare':
-                  "wether to create a bare repository on the remote side. "
-                  "'Default is '%(bare)s'.",
-           }
+        'debian-branch':
+            "Branch the Debian package is being developed on, "
+            "default is '%(debian-branch)s'",
+        'upstream-branch':
+            "Upstream branch, default is '%(upstream-branch)s'",
+        'upstream-tree':
+            "Where to generate the upstream tarball from "
+            "(tag or branch), default is '%(upstream-tree)s'",
+        'pq-from':
+            "How to find the patch queue base. DEBIAN or TAG, "
+            "the default is '%(pq-from)s'",
+        'debian-tag':
+            "Format string for debian tags, "
+            "default is '%(debian-tag)s'",
+        'debian-tag-msg':
+            "Format string for signed debian-tag messages, "
+            "default is '%(debian-tag-msg)s'",
+        'upstream-tag':
+            "Format string for upstream tags, "
+            "default is '%(upstream-tag)s'",
+        'sign-tags':
+            "Whether to sign tags, default is '%(sign-tags)s'",
+        'keyid':
+            "GPG keyid to sign tags with, default is '%(keyid)s'",
+        'import-msg':
+            "Format string for commit message used to commit "
+            "the upstream tarball, default is '%(import-msg)s'",
+        'commit-msg':
+            "Format string for commit messag used to commit, "
+            "the changelog, default is '%(commit-msg)s'",
+        'pristine-tar':
+            "Use pristine-tar to create orig tarball, "
+            "default is '%(pristine-tar)s'",
+        'pristine-tar-commit':
+            "When generating a tarball commit it to the pristine-tar branch '%(pristine-tar-commit)s' "
+            "default is '%(pristine-tar-commit)s'",
+        'filter-pristine-tar':
+            "Filter pristine-tar when filter option is used, default is '%(filter-pristine-tar)s'",
+        'filter':
+            "Files to filter out during import (can be given multiple times), default is %(filter)s",
+        'git-author':
+            "Use name and email from git-config for changelog trailer, default is '%(git-author)s'",
+        'full':
+            "Include the full commit message instead of only the first line, default is '%(full)s'",
+        'meta':
+            "Parse meta tags in commit messages, default is '%(meta)s'",
+        'meta-closes':
+            "Meta tags for the bts close commands, default is '%(meta-closes)s'",
+        'meta-closes-bugnum':
+            "Meta bug number format, default is '%(meta-closes-bugnum)s'",
+        'ignore-new':
+            "Build with uncommitted changes in the source tree, default is '%(ignore-new)s'",
+        'ignore-branch':
+            "Build although debian-branch != current branch, "
+            "default is '%(ignore-branch)s'",
+        'overlay':
+            "extract orig tarball when using export-dir option, "
+            "default is '%(overlay)s'",
+        'remote-url-pattern':
+            "Remote url pattern to create the repo at, "
+            "default is '%(remote-url-pattern)s'",
+        'multimaint':
+            "Note multiple maintainers, default is '%(multimaint)s'",
+        'multimaint-merge':
+            "Merge commits by maintainer, "
+            "default is '%(multimaint-merge)s'",
+        'pbuilder':
+            "Invoke git-pbuilder for building, "
+            "default is '%(pbuilder)s'",
+        'dist':
+            "Build for this distribution when using git-pbuilder, "
+            "default is '%(dist)s'",
+        'arch':
+            "Build for this architecture when using git-pbuilder, "
+            "default is '%(arch)s'",
+        'qemubuilder':
+            "Invoke git-pbuilder with qemubuilder for building, "
+            "default is '%(qemubuilder)s'",
+        'interactive':
+            "Run command interactively, default is '%(interactive)s'",
+        'color':
+            "Whether to use colored output, default is '%(color)s'",
+        'color-scheme':
+            "Colors to use in output (when color is enabled), format "
+            "is '<debug>:<info>:<warning>:<error>', e.g. "
+            "'cyan:34::'. Numerical values and color names are "
+            "accepted, empty fields indicate using the default.",
+        'spawn-editor':
+            "Whether to spawn an editor after adding the "
+            "changelog entry, default is '%(spawn-editor)s'",
+        'patch-numbers':
+            "Whether to number patch files, "
+            "default is %(patch-numbers)s",
+        'patch-num-format':
+            "The format specifier for patch number prefixes, "
+            "default is %(patch-num-format)s",
+        'renumber':
+            "Whether to renumber patches exported from patch queues, "
+            "instead of preserving the number specified in "
+            "'Gbp-Pq: Name' tags, default is %(renumber)s",
+        'notify':
+            "Whether to send a desktop notification after the build, "
+            "default is '%(notify)s'",
+        'merge':
+            "After the import merge the result to the debian branch, "
+            "default is '%(merge)s'",
+        'merge-mode':
+            "Howto merge the new upstream sources onto the debian branch"
+            "default is '%(merge-mode)s'",
+        'track':
+            "Set up tracking for remote branches, "
+            "default is '%(track)s'",
+        'author-is-committer':
+            "Use the authors's name also as the committer's name, "
+            "default is '%(author-is-committer)s'",
+        'author-date-is-committer-date':
+            "Use the authors's date as the committer's date, "
+            "default is '%(author-date-is-committer-date)s'",
+        'create-missing-branches':
+            "Create missing branches automatically, "
+            "default is '%(create-missing-branches)s'",
+        'submodules':
+            "Transparently handle submodules in the upstream tree, "
+            "default is '%(submodules)s'",
+        'postimport':
+            "hook run after a successful import, "
+            "default is '%(postimport)s'",
+        'hooks':
+            "Enable running all hooks, default is %(hooks)s",
+        'time-machine':
+            "don't try head commit only to apply the patch queue "
+            "but look TIME_MACHINE commits back, "
+            "default is '%(time-machine)d'",
+        'pbuilder-autoconf':
+            "Whether to configure pbuilder automatically, "
+            "default is '%(pbuilder-autoconf)s'",
+        'pbuilder-options':
+            "Options to pass to pbuilder, "
+            "default is '%(pbuilder-options)s'",
+        'template-dir':
+            "Template directory used by git init, "
+            "default is '%(template-dir)s'",
+        'remote-config':
+            "Remote defintion in gbp.conf used to create the remote "
+            "repository, default is '%(remote-config)s'",
+        'allow-unauthenticated':
+            "Don't verify integrity of downloaded source, "
+            "default is '%(allow-unauthenticated)s'",
+        'symlink-orig':
+            "Whether to creat a symlink from the upstream tarball "
+            "to the orig.tar.gz if needed, default is "
+            "'%(symlink-orig)s'",
+        'purge':
+            "Purge exported package build directory. Default is '%(purge)s'",
+        'drop':
+            "In case of 'export' drop the patch-queue branch "
+            "after export. Default is '%(drop)s'",
+        'commit':
+            "commit changes after export, Default is '%(commit)s'",
+        'rollback':
+            "Rollback repository changes when encountering an error",
+        'component':
+            'component name for additional tarballs',
+        'bare':
+            "wether to create a bare repository on the remote side. "
+            "'Default is '%(bare)s'.",
+    }
 
     def_config_files = {'/etc/git-buildpackage/gbp.conf': 'system',
-                        '~/.gbp.conf':                    'global',
-                        '%(top_dir)s/.gbp.conf':          None,
-                        '%(top_dir)s/debian/gbp.conf':    'debian',
-                        '%(git_dir)s/gbp.conf':           None}
+                        '~/.gbp.conf': 'global',
+                        '%(top_dir)s/.gbp.conf': None,
+                        '%(top_dir)s/debian/gbp.conf': 'debian',
+                        '%(git_dir)s/gbp.conf': None}
 
     list_opts = ['filter', 'component']
 
@@ -474,7 +477,7 @@ class GbpOptionParser(OptionParser):
         # Make sure we read any legacy sections prior to the real subcommands
         # section i.e. read [gbp-pull] prior to [pull]
         if (self.command.startswith('gbp-') or
-            self.command.startswith('git-')):
+                self.command.startswith('git-')):
             cmd = self.command[4:]
             oldcmd = self.command
             if parser.has_section(oldcmd):
@@ -499,7 +502,7 @@ class GbpOptionParser(OptionParser):
                 self.config.update(dict(parser._sections[section].items()))
             else:
                 raise configparser.NoSectionError(
-                        "Mandatory section [%s] does not exist." % section)
+                    "Mandatory section [%s] does not exist." % section)
 
         self.parse_lists()
 
@@ -535,10 +538,10 @@ class GbpOptionParser(OptionParser):
         """is option_name a boolean option"""
         ret = False
         try:
-            if kwargs['action'] in [ 'store_true', 'store_false' ]:
-                ret=True
+            if kwargs['action'] in ['store_true', 'store_false']:
+                ret = True
         except KeyError:
-            ret=False
+            ret = False
         return ret
 
     def _get_bool_default(self, option_name):
@@ -558,9 +561,9 @@ class GbpOptionParser(OptionParser):
         except KeyError:
             default = self.config[neg]
 
-        if default.lower() in ["true",  "1" ]:
+        if default.lower() in ["true", "1"]:
             val = 'True'
-        elif default.lower() in ["false", "0" ]:
+        elif default.lower() in ["false", "0"]:
             val = 'False'
         else:
             raise ValueError("Boolean options must be True or False")
@@ -677,8 +680,8 @@ class GbpOptionGroup(OptionGroup):
         if not help:
             help = self.parser.help[option_name]
         OptionGroup.add_option(self, "--%s%s" % (self.parser.prefix, option_name), dest=dest,
-                                default=self.parser.get_default(option_name, **kwargs),
-                                help=help % self.parser.config, **kwargs)
+                               default=self.parser.get_default(option_name, **kwargs),
+                               help=help % self.parser.config, **kwargs)
 
     def add_boolean_config_file_option(self, option_name, dest):
         self.add_config_file_option(option_name=option_name, dest=dest, action="store_true")
@@ -691,9 +694,9 @@ class GbpOptionParserDebian(GbpOptionParser):
     Handles commandline options and parsing of config files for Debian tools
     """
     defaults = dict(GbpOptionParser.defaults)
-    defaults.update( {
-                       'builder'            : 'debuild -i -I',
-                     } )
+    defaults.update({
+        'builder': 'debuild -i -I',
+    })
 
 
 class GbpOptionParserRpm(GbpOptionParser):
@@ -702,32 +705,32 @@ class GbpOptionParserRpm(GbpOptionParser):
     """
     defaults = dict(GbpOptionParser.defaults)
     defaults.update({
-            'tmp-dir'                   : '/var/tmp/gbp/',
-            'vendor'                    : 'Downstream',
-            'packaging-branch'          : 'master',
-            'packaging-dir'             : '',
-            'packaging-tag-msg'         : ('%(pkg)s (vendor)s release '
-                                                         '%(version)s'),
-            'packaging-tag'             : 'packaging/%(version)s',
-            'export-sourcedir'          : 'SOURCES',
-            'export-specdir'            : 'SPECS',
-            'export-dir'                : '../rpmbuild',
-            'builder'                   : 'rpmbuild',
-            'spec-file'                 : '',
-            'mock'                      : 'False',
-            'dist'                      : '',
-            'arch'                      : '',
-            'mock-root'                 : '',
-            'mock-options'              : '',
-            'native'                    : 'auto',
-            'changelog-file'            : 'auto',
-            'changelog-revision'        : '',
-            'spawn-editor'              : 'always',
-            'editor-cmd'                : 'vim',
-                    })
+        'tmp-dir': '/var/tmp/gbp/',
+        'vendor': 'Downstream',
+        'packaging-branch': 'master',
+        'packaging-dir': '',
+        'packaging-tag-msg': '%(pkg)s (vendor)s release %(version)s',
+        'packaging-tag': 'packaging/%(version)s',
+        'export-sourcedir': 'SOURCES',
+        'export-specdir': 'SPECS',
+        'export-dir': '../rpmbuild',
+        'builder': 'rpmbuild',
+        'spec-file': '',
+        'mock': 'False',
+        'dist': '',
+        'arch': '',
+        'mock-root': '',
+        'mock-options': '',
+        'native': 'auto',
+        'changelog-file': 'auto',
+        'changelog-revision': '',
+        'spawn-editor': 'always',
+        'editor-cmd': 'vim',
+    })
 
     help = dict(GbpOptionParser.help)
-    help.update({
+    help.update(
+        {
             'tmp-dir':
                 "Base directory under which temporary directories are "
                 "created, default is '%(tmp-dir)s'",
@@ -744,8 +747,8 @@ class GbpOptionParserRpm(GbpOptionParser):
                 "Format string for packaging tags, RPM counterpart of the "
                 "'debian-tag' option, default is '%(packaging-tag)s'",
             'packaging-tag-msg':
-               ("Format string for packaging tag messages, "
-                "default is '%(packaging-tag-msg)s'"),
+                "Format string for packaging tag messages, "
+                "default is '%(packaging-tag-msg)s'",
             'spec-file':
                 "Spec file to use, causes the packaging-dir option to be "
                 "ignored, default is '%(spec-file)s'",
@@ -756,21 +759,21 @@ class GbpOptionParserRpm(GbpOptionParser):
             'export-specdir':
                 "Subdir (under EXPORT_DIR) where package spec file is "
                 "exported default is '%(export-specdir)s'",
-             'mock':
-                  ("Invoke mock for building using gbp-builder-mock, "
-                   "default is '%(mock)s'"),
-             'dist':
-                 ("Build for this distribution when using mock. E.g.: epel-6, "
-                   "default is '%(dist)s'"),
-             'arch':
-                  ("Build for this architecture when using mock, "
-                   "default is '%(arch)s'"),
-             'mock-root':
-                 ("The mock root (-r) name for building with mock: <dist>-<arch>, "
-                   "default is '%(mock-root)s'"),
-             'mock-options':
-                  ("Options to pass to mock, "
-                   "default is '%(mock-options)s'"),
+            'mock':
+                "Invoke mock for building using gbp-builder-mock, "
+                "default is '%(mock)s'",
+            'dist':
+                "Build for this distribution when using mock. E.g.: epel-6, "
+                "default is '%(dist)s'",
+            'arch':
+                "Build for this architecture when using mock, "
+                "default is '%(arch)s'",
+            'mock-root':
+                "The mock root (-r) name for building with mock: <dist>-<arch>, "
+                "default is '%(mock-root)s'",
+            'mock-options':
+                "Options to pass to mock, "
+                "default is '%(mock-options)s'",
             'native':
                 "Treat this package as native, default is '%(native)s'",
             'changelog-file':
@@ -784,6 +787,6 @@ class GbpOptionParserRpm(GbpOptionParser):
             'git-author':
                 "Use name and email from git-config for the changelog header, "
                 "default is '%(git-author)s'",
-                 })
+        })
 
 # vim:et:ts=4:sw=4:et:sts=4:ai:set list listchars=tab\:»·,trail\:·: