From dc7b7af42a8fc3f7618dfbe6c26c0ae935fd2ede Mon Sep 17 00:00:00 2001 From: yatin Date: Mon, 26 Sep 2016 15:46:17 +0530 Subject: [PATCH] Remove safe_utils.py safe_utils.py is not used after it's use is removed in below patch: https://review.openstack.org/#/c/320843/ This module is removed with this patch. Change-Id: Ib75c60edc4bc8fb6e5b46c35e6975eb821b29797 Partial-Bug: #1627663 --- magnum/common/safe_utils.py | 53 ------------ magnum/tests/unit/common/test_safeutils.py | 99 ---------------------- 2 files changed, 152 deletions(-) delete mode 100644 magnum/common/safe_utils.py delete mode 100644 magnum/tests/unit/common/test_safeutils.py diff --git a/magnum/common/safe_utils.py b/magnum/common/safe_utils.py deleted file mode 100644 index 0d4572e213..0000000000 --- a/magnum/common/safe_utils.py +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# Copyright 2011 Justin Santa Barbara -# All Rights Reserved. -# -# 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. - -"""Utilities and helper functions that won't produce circular imports.""" - -import inspect - - -def getcallargs(function, *args, **kwargs): - """This is a simplified inspect.getcallargs (2.7+). - - It should be replaced when python >= 2.7 is standard. - """ - keyed_args = {} - argnames, varargs, keywords, defaults = inspect.getargspec(function) - - keyed_args.update(kwargs) - - # NOTE(alaski) the implicit 'self' or 'cls' argument shows up in - # argnames but not in args or kwargs. Uses 'in' rather than '==' because - # some tests use 'self2'. - if 'self' in argnames[0] or 'cls' == argnames[0]: - # The function may not actually be a method or have __self__. - # Typically seen when it's stubbed with mox. - if inspect.ismethod(function) and hasattr(function, '__self__'): - keyed_args[argnames[0]] = function.__self__ - else: - keyed_args[argnames[0]] = None - - remaining_argnames = filter(lambda x: x not in keyed_args, argnames) - keyed_args.update(dict(zip(remaining_argnames, args))) - - if defaults: - num_defaults = len(defaults) - for argname, value in zip(argnames[-num_defaults:], defaults): - if argname not in keyed_args: - keyed_args[argname] = value - - return keyed_args diff --git a/magnum/tests/unit/common/test_safeutils.py b/magnum/tests/unit/common/test_safeutils.py deleted file mode 100644 index 89e45d2411..0000000000 --- a/magnum/tests/unit/common/test_safeutils.py +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 2011 Justin Santa Barbara -# -# 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. - -from magnum.common import safe_utils -from magnum.tests import base - - -class GetCallArgsTestCase(base.BaseTestCase): - - def _test_func(self, instance, red=None, blue=None): - pass - - def test_all_kwargs(self): - args = () - kwargs = {'instance': {'uuid': 1}, 'red': 3, 'blue': 4} - callargs = safe_utils.getcallargs(self._test_func, *args, **kwargs) - # implicit self counts as an arg - self.assertEqual(4, len(callargs)) - self.assertIn('instance', callargs) - self.assertEqual({'uuid': 1}, callargs['instance']) - self.assertIn('red', callargs) - self.assertEqual(3, callargs['red']) - self.assertIn('blue', callargs) - self.assertEqual(4, callargs['blue']) - - def test_all_args(self): - args = ({'uuid': 1}, 3, 4) - kwargs = {} - callargs = safe_utils.getcallargs(self._test_func, *args, **kwargs) - # implicit self counts as an arg - self.assertEqual(4, len(callargs)) - self.assertIn('instance', callargs) - self.assertEqual({'uuid': 1}, callargs['instance']) - self.assertIn('red', callargs) - self.assertEqual(3, callargs['red']) - self.assertIn('blue', callargs) - self.assertEqual(4, callargs['blue']) - - def test_mixed_args(self): - args = ({'uuid': 1}, 3) - kwargs = {'blue': 4} - callargs = safe_utils.getcallargs(self._test_func, *args, **kwargs) - # implicit self counts as an arg - self.assertEqual(4, len(callargs)) - self.assertIn('instance', callargs) - self.assertEqual({'uuid': 1}, callargs['instance']) - self.assertIn('red', callargs) - self.assertEqual(3, callargs['red']) - self.assertIn('blue', callargs) - self.assertEqual(4, callargs['blue']) - - def test_partial_kwargs(self): - args = () - kwargs = {'instance': {'uuid': 1}, 'red': 3} - callargs = safe_utils.getcallargs(self._test_func, *args, **kwargs) - # implicit self counts as an arg - self.assertEqual(4, len(callargs)) - self.assertIn('instance', callargs) - self.assertEqual({'uuid': 1}, callargs['instance']) - self.assertIn('red', callargs) - self.assertEqual(3, callargs['red']) - self.assertIn('blue', callargs) - self.assertIsNone(callargs['blue']) - - def test_partial_args(self): - args = ({'uuid': 1}, 3) - kwargs = {} - callargs = safe_utils.getcallargs(self._test_func, *args, **kwargs) - # implicit self counts as an arg - self.assertEqual(4, len(callargs)) - self.assertIn('instance', callargs) - self.assertEqual({'uuid': 1}, callargs['instance']) - self.assertIn('red', callargs) - self.assertEqual(3, callargs['red']) - self.assertIn('blue', callargs) - self.assertIsNone(callargs['blue']) - - def test_partial_mixed_args(self): - args = (3,) - kwargs = {'instance': {'uuid': 1}} - callargs = safe_utils.getcallargs(self._test_func, *args, **kwargs) - self.assertEqual(4, len(callargs)) - self.assertIn('instance', callargs) - self.assertEqual({'uuid': 1}, callargs['instance']) - self.assertIn('red', callargs) - self.assertEqual(3, callargs['red']) - self.assertIn('blue', callargs) - self.assertIsNone(callargs['blue'])