From c1ea2989049c102fde0ea22ac06d066a34d7b0db Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh@jk0.org>
Date: Mon, 21 Jan 2013 13:44:38 -0600
Subject: Clean up test environment and remove unused imports.

First round of adding more complete unit test coverage.

Change-Id: Ic1979c499ca6fcb784892a95954a3527539c4e53
---
 openstackclient/common/clientmanager.py    | 1 -
 openstackclient/common/openstackkeyring.py | 1 -
 openstackclient/common/utils.py            | 2 --
 openstackclient/compute/client.py          | 1 -
 openstackclient/compute/v2/server.py       | 1 -
 openstackclient/identity/client.py         | 1 -
 openstackclient/openstack/common/setup.py  | 4 ----
 7 files changed, 11 deletions(-)

(limited to 'openstackclient')

diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
index 73c2e570..4d049213 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/openstackkeyring.py b/openstackclient/common/openstackkeyring.py
index 3a5ce27f..2b03e753 100644
--- a/openstackclient/common/openstackkeyring.py
+++ b/openstackclient/common/openstackkeyring.py
@@ -21,7 +21,6 @@ Keyring backend for Openstack, to store encrypted password in a file.
 
 from Crypto.Cipher import AES
 
-import crypt
 import keyring
 import os
 
diff --git a/openstackclient/common/utils.py b/openstackclient/common/utils.py
index 70555be5..c099889d 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/compute/client.py b/openstackclient/compute/client.py
index 3c17b17a..bef9f949 100644
--- a/openstackclient/compute/client.py
+++ b/openstackclient/compute/client.py
@@ -17,7 +17,6 @@
 
 import logging
 
-from openstackclient.common import exceptions as exc
 from openstackclient.common import utils
 
 LOG = logging.getLogger(__name__)
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index e496bd45..366d7640 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -21,7 +21,6 @@ Server action implementations
 
 import logging
 import os
-import sys
 import time
 
 from cliff import command
diff --git a/openstackclient/identity/client.py b/openstackclient/identity/client.py
index b7066e5e..3d58ad7b 100644
--- a/openstackclient/identity/client.py
+++ b/openstackclient/identity/client.py
@@ -17,7 +17,6 @@
 
 import logging
 
-from openstackclient.common import exceptions as exc
 from openstackclient.common import utils
 
 LOG = logging.getLogger(__name__)
diff --git a/openstackclient/openstack/common/setup.py b/openstackclient/openstack/common/setup.py
index e6f72f03..e960002d 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)
 
-- 
cgit v1.2.1