aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2016-07-05 21:26:37 +0200
committerGuido Günther <agx@sigxcpu.org>2016-07-05 21:26:37 +0200
commit24cd58b282e62b46e6b215f6e6d9ec09626a578f (patch)
tree69631eb32dec5cb683446f9525bed22c5dfb07fe
parent29f16cafbf62f5a7ac63565135ebc5de009f0017 (diff)
Remove some leftover configparser imports
Git-Dch: Ignore
-rwxr-xr-xexamples/gbp-posttag-push7
-rwxr-xr-xgbp/scripts/buildpackage.py1
-rwxr-xr-xgbp/scripts/clone.py1
-rwxr-xr-xgbp/scripts/config.py1
4 files changed, 4 insertions, 6 deletions
diff --git a/examples/gbp-posttag-push b/examples/gbp-posttag-push
index c65ef4b3..0a9bf65e 100755
--- a/examples/gbp-posttag-push
+++ b/examples/gbp-posttag-push
@@ -21,7 +21,6 @@
from __future__ import print_function
-from six.moves import configparser
import os
import subprocess
import sys
@@ -30,6 +29,8 @@ import gbp.log
from gbp.config import GbpOptionParser
from gbp.deb.git import DebianGitRepository
+from gbp.errors import GbpError
+from gbp.scripts.common import ExitCodes
class Env(object):
@@ -84,9 +85,9 @@ def main(argv):
try:
parser = GbpOptionParser(command=os.path.basename(argv[0]), prefix='',
usage='%prog [options] paths')
- except configparser.ParsingError as err:
+ except GbpError as err:
gbp.log.error(err)
- return 1
+ return ExitCodes.parse_error
parser.add_option("-d", "--dry-run", dest="dryrun", default=False,
action="store_true", help="dry run, don't push.")
diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py
index a792a04d..849e9bdb 100755
--- a/gbp/scripts/buildpackage.py
+++ b/gbp/scripts/buildpackage.py
@@ -17,7 +17,6 @@
#
"""Build a Debian package out of a Git repository"""
-from six.moves import configparser
import errno
import os, os.path
import shutil
diff --git a/gbp/scripts/clone.py b/gbp/scripts/clone.py
index b2717fa3..4464350d 100755
--- a/gbp/scripts/clone.py
+++ b/gbp/scripts/clone.py
@@ -19,7 +19,6 @@
#
"""Clone a Git repository and set it up for gbp"""
-from six.moves import configparser
import sys
import os, os.path
from gbp.config import (GbpOptionParser, GbpOptionGroup)
diff --git a/gbp/scripts/config.py b/gbp/scripts/config.py
index 006c7aab..72bcc886 100755
--- a/gbp/scripts/config.py
+++ b/gbp/scripts/config.py
@@ -17,7 +17,6 @@
#
"""Query and display config file values"""
-from six.moves import configparser
import sys
import os, os.path
from gbp.config import GbpOptionParser