diff options
author | Guido Günther <agx@sigxcpu.org> | 2017-10-20 12:37:57 +0200 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2017-10-20 12:37:57 +0200 |
commit | 99b525843e130611798a8e127b5f3cc11dbb26be (patch) | |
tree | 715c53e80c46f243adabb93853e0d1a757deaff7 | |
parent | ec7d0cf0f90a4acd5ff0d25915f21e4b522740ed (diff) |
Kill six.moves
-rw-r--r-- | gbp/config.py | 2 | ||||
-rw-r--r-- | gbp/scripts/create_remote_repo.py | 4 | ||||
-rwxr-xr-x | gbp/scripts/import_srpm.py | 4 | ||||
-rw-r--r-- | tests/component/rpm/test_import_srpm.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/gbp/config.py b/gbp/config.py index d4b726a7..8acf15da 100644 --- a/gbp/config.py +++ b/gbp/config.py @@ -17,7 +17,7 @@ """handles command line and config file option parsing for the gbp commands""" from optparse import OptionParser, OptionGroup, Option, OptionValueError -from six.moves import configparser +import configparser from copy import copy import errno import os.path diff --git a/gbp/scripts/create_remote_repo.py b/gbp/scripts/create_remote_repo.py index 1b99d052..ee064e5b 100644 --- a/gbp/scripts/create_remote_repo.py +++ b/gbp/scripts/create_remote_repo.py @@ -22,12 +22,12 @@ from __future__ import print_function import sys import os -from six.moves import urllib +import urllib import subprocess import tty import termios import re -from six.moves import configparser +import configparser from gbp.deb.changelog import ChangeLog, NoChangeLogError from gbp.command_wrappers import (CommandExecFailed, GitCommand) diff --git a/gbp/scripts/import_srpm.py b/gbp/scripts/import_srpm.py index 1de5d690..e9e08d3b 100755 --- a/gbp/scripts/import_srpm.py +++ b/gbp/scripts/import_srpm.py @@ -24,8 +24,8 @@ import glob import time import shutil import errno -from six.moves.urllib.request import urlopen -from six.moves import urllib +from urllib.request import urlopen +import urllib import gbp.command_wrappers as gbpc from gbp.tmpfile import init_tmpdir, del_tmpdir, tempfile diff --git a/tests/component/rpm/test_import_srpm.py b/tests/component/rpm/test_import_srpm.py index fd73d954..f57445b4 100644 --- a/tests/component/rpm/test_import_srpm.py +++ b/tests/component/rpm/test_import_srpm.py @@ -18,7 +18,7 @@ import os import shutil -from six.moves import urllib +import urllib from nose.plugins.skip import SkipTest from nose.tools import assert_raises, eq_, ok_ # pylint: disable=E0611 from mock import Mock |