From 5526565ac4d25748592130cd895c29bb6307adf9 Mon Sep 17 00:00:00 2001 From: Josh Kearney Date: Mon, 21 Jan 2013 13:44:38 -0600 Subject: [PATCH] Clean up test environment and remove unused imports. First round of adding more complete unit test coverage. Change-Id: Ic1979c499ca6fcb784892a95954a3527539c4e53 --- .mailmap | 2 ++ openstackclient/common/clientmanager.py | 1 - openstackclient/common/utils.py | 2 -- openstackclient/openstack/common/setup.py | 4 ---- 4 files changed, 2 insertions(+), 7 deletions(-) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..c3f1f56 --- /dev/null +++ b/.mailmap @@ -0,0 +1,2 @@ + + diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py index 73c2e57..4d04921 100644 --- a/openstackclient/common/clientmanager.py +++ b/openstackclient/common/clientmanager.py @@ -20,7 +20,6 @@ import logging -from openstackclient.common import exceptions as exc from openstackclient.compute import client as compute_client from openstackclient.identity import client as identity_client from openstackclient.image import client as image_client diff --git a/openstackclient/common/utils.py b/openstackclient/common/utils.py index 70555be..c099889 100644 --- a/openstackclient/common/utils.py +++ b/openstackclient/common/utils.py @@ -23,8 +23,6 @@ import os import sys import uuid -import prettytable - from openstackclient.common import exceptions diff --git a/openstackclient/openstack/common/setup.py b/openstackclient/openstack/common/setup.py index e6f72f0..e960002 100644 --- a/openstackclient/openstack/common/setup.py +++ b/openstackclient/openstack/common/setup.py @@ -78,10 +78,6 @@ def parse_requirements(requirements_files=['requirements.txt', # -f lines are for index locations, and don't get used here elif re.match(r'\s*-f\s+', line): pass - # argparse is part of the standard library starting with 2.7 - # adding it to the requirements list screws distro installs - elif line == 'argparse' and sys.version_info >= (2, 7): - pass else: requirements.append(line)