From b8250088a6d0a9e78b51a9d43187c4867da113b3 Mon Sep 17 00:00:00 2001 From: Chmouel Boudjnah Date: Sun, 19 Jan 2014 00:11:32 -0800 Subject: [PATCH] Remove ununsed httplib2 requirement This is not needed anymore since the logging is handled by six.moves/httplib. Change-Id: I4de3cfd8d8d3c08b38e39fde12172bdb4de0cea0 Closes-Bug: 1272986 --- ceilometerclient/shell.py | 2 -- ceilometerclient/tests/test_shell.py | 6 ------ requirements.txt | 1 - 3 files changed, 9 deletions(-) diff --git a/ceilometerclient/shell.py b/ceilometerclient/shell.py index 57cb604f..9e893dca 100644 --- a/ceilometerclient/shell.py +++ b/ceilometerclient/shell.py @@ -17,7 +17,6 @@ Command-line interface to the OpenStack Telemetry API. from __future__ import print_function import argparse -import httplib2 import logging import sys @@ -223,7 +222,6 @@ class CeilometerShell(object): format = '%(levelname)s (%(module)s:%(lineno)d) %(message)s' if debug: logging.basicConfig(format=format, level=logging.DEBUG) - httplib2.debuglevel = 1 else: logging.basicConfig(format=format, level=logging.WARN) diff --git a/ceilometerclient/tests/test_shell.py b/ceilometerclient/tests/test_shell.py index c71e10b7..cb0668e0 100644 --- a/ceilometerclient/tests/test_shell.py +++ b/ceilometerclient/tests/test_shell.py @@ -10,7 +10,6 @@ # License for the specific language governing permissions and limitations # under the License. -import httplib2 import re import six import sys @@ -65,11 +64,6 @@ class ShellTest(utils.BaseTestCase): def test_help_unknown_command(self): self.assertRaises(exc.CommandError, self.shell, 'help foofoo') - def test_debug(self): - httplib2.debuglevel = 0 - self.shell('--debug help') - self.assertEqual(httplib2.debuglevel, 1) - def test_help(self): required = [ '.*?^usage: ceilometer', diff --git a/requirements.txt b/requirements.txt index f032cafb..1f33a825 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ pbr>=0.5.21,<1.0 argparse -httplib2 iso8601>=0.1.8 PrettyTable>=0.7,<0.8 python-keystoneclient>=0.4.1