openstack/python-ceilometerclient
Code Issues Proposed changes

Merge "Fix pep H306 (import order)"

Browse Source
This commit is contained in:
Jenkins
2013-05-22 23:36:24 +00:00
committed by Gerrit Code Review
parent 399e422ef8 10e2473199
commit a1a21bd7fd
5 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometerclient/common/utils.py
View File

@@ -13,8 +13,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import errno
import hashlib
import os import os
import sys import sys
import textwrap import textwrap

2
ceilometerclient/shell.py
View File

@@ -23,8 +23,8 @@ from keystoneclient.v2_0 import client as ksclient
import ceilometerclient import ceilometerclient
from ceilometerclient import client as ceiloclient from ceilometerclient import client as ceiloclient
from ceilometerclient import exc
from ceilometerclient.common import utils from ceilometerclient.common import utils
from ceilometerclient import exc
class CeilometerShell(object): class CeilometerShell(object):

2
ceilometerclient/v2/shell.py
View File

@@ -17,8 +17,8 @@
# under the License. # under the License.
from ceilometerclient.common import utils from ceilometerclient.common import utils
from ceilometerclient import exc
from ceilometerclient.v2 import options from ceilometerclient.v2 import options
import ceilometerclient.exc as exc
@utils.arg('-q', '--query', metavar='<QUERY>', @utils.arg('-q', '--query', metavar='<QUERY>',

4
tests/test_shell.py
View File

@@ -13,8 +13,8 @@ except ImportError:
from keystoneclient.v2_0 import client as ksclient from keystoneclient.v2_0 import client as ksclient
from ceilometerclient import exc from ceilometerclient import exc
from ceilometerclient import shell as ceilometer_shell
from ceilometerclient.v1 import client as v1client from ceilometerclient.v1 import client as v1client
import ceilometerclient.shell
from tests import utils from tests import utils
FAKE_ENV = {'OS_USERNAME': 'username', FAKE_ENV = {'OS_USERNAME': 'username',
@@ -41,7 +41,7 @@ class ShellTest(utils.BaseTestCase):
orig = sys.stdout orig = sys.stdout
try: try:
sys.stdout = cStringIO.StringIO() sys.stdout = cStringIO.StringIO()
_shell = ceilometerclient.shell.CeilometerShell() _shell = ceilometer_shell.CeilometerShell()
_shell.main(argstr.split()) _shell.main(argstr.split())
except SystemExit: except SystemExit:
exc_type, exc_value, exc_traceback = sys.exc_info() exc_type, exc_value, exc_traceback = sys.exc_info()

2
tests/utils.py
View File

@@ -15,8 +15,8 @@
import copy import copy
import fixtures import fixtures
import StringIO
import mox import mox
import StringIO
import testtools import testtools
from ceilometerclient.common import http from ceilometerclient.common import http