From 4a8db7a62af7a7834c62d0e389ac4b2178fb44ce Mon Sep 17 00:00:00 2001 From: =?utf8?q?Guido=20G=C3=BCnther?= Date: Mon, 13 Feb 2012 18:56:28 +0100 Subject: [PATCH] Rename GbpOptionParserCommon common to GbpOptionParser --- gbp/config.py | 6 +++--- gbp/scripts/clone.py | 6 +++--- gbp/scripts/pull.py | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gbp/config.py b/gbp/config.py index 87334f0..090c4f7 100644 --- a/gbp/config.py +++ b/gbp/config.py @@ -51,7 +51,7 @@ class GbpOption(Option): TYPE_CHECKER['path'] = expand_path TYPE_CHECKER['tristate'] = check_tristate -class GbpOptionParserCommon(OptionParser): +class GbpOptionParser(OptionParser): """ Handles commandline options and parsing of config files @ivar command: the gbp command we store the options for @@ -326,11 +326,11 @@ class GbpOptionGroup(OptionGroup): self.add_config_file_option(option_name="no-%s" % option_name, dest=dest, help=neg_help, action="store_false") -class GbpOptionParserDebian(GbpOptionParserCommon): +class GbpOptionParserDebian(GbpOptionParser): """ Handles commandline options and parsing of config files for Debian tools """ - defaults = dict(GbpOptionParserCommon.defaults) + defaults = dict(GbpOptionParser.defaults) defaults.update( { 'builder' : 'debuild -i -I', 'cleaner' : 'debuild -d clean', diff --git a/gbp/scripts/clone.py b/gbp/scripts/clone.py index ab2fc97..5dffbd0 100755 --- a/gbp/scripts/clone.py +++ b/gbp/scripts/clone.py @@ -21,7 +21,7 @@ import sys import os, os.path -from gbp.config import (GbpOptionParserCommon, GbpOptionGroup) +from gbp.config import (GbpOptionParser, GbpOptionGroup) from gbp.deb.git import DebianGitRepository from gbp.git import (GitRepository, GitRepositoryError) from gbp.command_wrappers import (Command, CommandExecFailed) @@ -30,8 +30,8 @@ import gbp.log def parse_args (argv): - parser = GbpOptionParserCommon(command=os.path.basename(argv[0]), prefix='', - usage='%prog [options] repository - clone a remote repository') + parser = GbpOptionParser(command=os.path.basename(argv[0]), prefix='', + usage='%prog [options] repository - clone a remote repository') branch_group = GbpOptionGroup(parser, "branch options", "branch tracking and layout options") parser.add_option_group(branch_group) diff --git a/gbp/scripts/pull.py b/gbp/scripts/pull.py index 9c6f2c5..d50ffc2 100755 --- a/gbp/scripts/pull.py +++ b/gbp/scripts/pull.py @@ -22,7 +22,7 @@ import sys import os, os.path from gbp.command_wrappers import (Command, CommandExecFailed) -from gbp.config import (GbpOptionParserCommon, GbpOptionGroup) +from gbp.config import (GbpOptionParser, GbpOptionGroup) from gbp.errors import GbpError from gbp.git import GitRepositoryError from gbp.deb.git import DebianGitRepository @@ -70,8 +70,8 @@ def fast_forward_branch(branch, repo, options): def main(argv): retval = 0 - parser = GbpOptionParserCommon(command=os.path.basename(argv[0]), prefix='', - usage='%prog [options] - safely update a repository from remote') + parser = GbpOptionParser(command=os.path.basename(argv[0]), prefix='', + usage='%prog [options] - safely update a repository from remote') branch_group = GbpOptionGroup(parser, "branch options", "branch update and layout options") parser.add_option_group(branch_group) branch_group.add_option("--force", action="store_true", dest="force", default=False, -- 2.7.4