From 3d5c200f2e93d78a03f918d37949b18bb8934792 Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Fri, 8 Aug 2014 15:39:13 +0100 Subject: [PATCH] Remove unused openstack.common.cliutils cliutils was included in the original copy from Ironic and isn't used anymore. Change-Id: I6f5c88ac0136ff014aeb8c65c6bac85412b33fc8 --- openstack-common.conf | 1 - tuskar/openstack/common/cliutils.py | 63 ----------------------------- 2 files changed, 64 deletions(-) delete mode 100644 tuskar/openstack/common/cliutils.py diff --git a/openstack-common.conf b/openstack-common.conf index d006435f..92dd1881 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -1,5 +1,4 @@ [DEFAULT] -module=cliutils module=config.generator module=db module=db.sqlalchemy diff --git a/tuskar/openstack/common/cliutils.py b/tuskar/openstack/common/cliutils.py deleted file mode 100644 index 411bd58f..00000000 --- a/tuskar/openstack/common/cliutils.py +++ /dev/null @@ -1,63 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2012 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import inspect - - -class MissingArgs(Exception): - - def __init__(self, missing): - self.missing = missing - - def __str__(self): - if len(self.missing) == 1: - return "An argument is missing" - else: - return ("%(num)d arguments are missing" % - dict(num=len(self.missing))) - - -def validate_args(fn, *args, **kwargs): - """Check that the supplied args are sufficient for calling a function. - - >>> validate_args(lambda a: None) - Traceback (most recent call last): - ... - MissingArgs: An argument is missing - >>> validate_args(lambda a, b, c, d: None, 0, c=1) - Traceback (most recent call last): - ... - MissingArgs: 2 arguments are missing - - :param fn: the function to check - :param arg: the positional arguments supplied - :param kwargs: the keyword arguments supplied - """ - argspec = inspect.getargspec(fn) - - num_defaults = len(argspec.defaults or []) - required_args = argspec.args[:len(argspec.args) - num_defaults] - - def isbound(method): - return getattr(method, 'im_self', None) is not None - - if isbound(fn): - required_args.pop(0) - - missing = [arg for arg in required_args if arg not in kwargs] - missing = missing[len(args):] - if missing: - raise MissingArgs(missing)