diff options
| author | Dina Belova <dbelova@mirantis.com> | 2014-12-10 13:01:29 +0300 |
|---|---|---|
| committer | Dina Belova <dbelova@mirantis.com> | 2014-12-10 15:24:37 +0300 |
| commit | ce8c06d413d52e3e392eca3f311fc2d3334c05a2 (patch) | |
| tree | 55993506bc576bb7c145ff74b02847d3c2bb046e | |
| parent | 9307ae81321364ba574c463086cc95411da9e4b2 (diff) | |
| download | python-ceilometerclient-ce8c06d413d52e3e392eca3f311fc2d3334c05a2.tar.gz | |
Make methods static where it's possible
Change-Id: If6c1fa05044e65ec1e72a3e5f63e6db826469a2d
| -rw-r--r-- | ceilometerclient/shell.py | 6 | ||||
| -rw-r--r-- | ceilometerclient/tests/fakes.py | 3 | ||||
| -rw-r--r-- | ceilometerclient/tests/test_client.py | 3 | ||||
| -rw-r--r-- | ceilometerclient/v2/statistics.py | 3 |
4 files changed, 10 insertions, 5 deletions
diff --git a/ceilometerclient/shell.py b/ceilometerclient/shell.py index 7356789..51ef034 100644 --- a/ceilometerclient/shell.py +++ b/ceilometerclient/shell.py @@ -143,7 +143,8 @@ class CeilometerShell(object): subparser.add_argument(*args, **kwargs) subparser.set_defaults(func=callback) - def _setup_logging(self, debug): + @staticmethod + def _setup_logging(debug): format = '%(levelname)s (%(module)s) %(message)s' if debug: logging.basicConfig(format=format, level=logging.DEBUG) @@ -174,7 +175,8 @@ class CeilometerShell(object): # Return parsed args return api_version, subcommand_parser.parse_args(argv) - def no_project_and_domain_set(self, args): + @staticmethod + def no_project_and_domain_set(args): if not (args.os_project_id or (args.os_project_name and (args.os_user_domain_name or args.os_user_domain_id)) or (args.os_tenant_id or args.os_tenant_name)): diff --git a/ceilometerclient/tests/fakes.py b/ceilometerclient/tests/fakes.py index 1728e5e..10d8d8c 100644 --- a/ceilometerclient/tests/fakes.py +++ b/ceilometerclient/tests/fakes.py @@ -30,7 +30,8 @@ def fake_headers(): class FakeServiceCatalog(object): - def url_for(self, endpoint_type, service_type): + @staticmethod + def url_for(endpoint_type, service_type): return 'http://192.168.1.5:8004/v1/f14b41234' diff --git a/ceilometerclient/tests/test_client.py b/ceilometerclient/tests/test_client.py index 3594f3a..b569ff3 100644 --- a/ceilometerclient/tests/test_client.py +++ b/ceilometerclient/tests/test_client.py @@ -35,7 +35,8 @@ FAKE_ENV = { class ClientTest(utils.BaseTestCase): - def create_client(self, env, api_version=2, endpoint=None, exclude=[]): + @staticmethod + def create_client(env, api_version=2, endpoint=None, exclude=[]): env = dict((k, v) for k, v in env.items() if k not in exclude) diff --git a/ceilometerclient/v2/statistics.py b/ceilometerclient/v2/statistics.py index e8c92e8..a5cce23 100644 --- a/ceilometerclient/v2/statistics.py +++ b/ceilometerclient/v2/statistics.py @@ -25,7 +25,8 @@ class Statistics(base.Resource): class StatisticsManager(base.Manager): resource_class = Statistics - def _build_aggregates(self, aggregates): + @staticmethod + def _build_aggregates(aggregates): url_aggregates = [] for aggregate in aggregates: if 'param' in aggregate: |