From b7bc733b63d71bf9c9e3ed510cd82e3ad8751a68 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 14 Aug 2019 11:07:34 -0400 Subject: [PATCH] bt2: rename `_Trace.env` -> `_Trace.environment` This matches the library functions. Signed-off-by: Philippe Proulx Change-Id: I20c8ff4f69ad1a6fcce19203374c0ffc7d413009 Reviewed-on: https://review.lttng.org/c/babeltrace/+/1927 Tested-by: jenkins Reviewed-by: Francis Deslauriers --- src/bindings/python/bt2/bt2/trace.py | 6 +++--- src/bindings/python/bt2/bt2/trace_class.py | 8 ++++---- tests/bindings/python/bt2/test_trace.py | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/bindings/python/bt2/bt2/trace.py b/src/bindings/python/bt2/bt2/trace.py index 7f98ac86..fcfd16b1 100644 --- a/src/bindings/python/bt2/bt2/trace.py +++ b/src/bindings/python/bt2/bt2/trace.py @@ -31,7 +31,7 @@ import functools import uuid as uuidp -class _TraceEnv(collections.abc.MutableMapping): +class _TraceEnvironment(collections.abc.MutableMapping): def __init__(self, trace): self._trace = trace @@ -154,8 +154,8 @@ class _Trace(object._SharedObject, collections.abc.Mapping): _uuid = property(fset=_uuid) @property - def env(self): - return _TraceEnv(self) + def environment(self): + return _TraceEnvironment(self) def create_stream(self, stream_class, id=None, name=None, user_attributes=None): utils._check_type(stream_class, bt2_stream_class._StreamClass) diff --git a/src/bindings/python/bt2/bt2/trace_class.py b/src/bindings/python/bt2/bt2/trace_class.py index 1ec2a505..bd39beab 100644 --- a/src/bindings/python/bt2/bt2/trace_class.py +++ b/src/bindings/python/bt2/bt2/trace_class.py @@ -48,7 +48,7 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping): # Instantiate a trace of this class. - def __call__(self, name=None, user_attributes=None, uuid=None, env=None): + def __call__(self, name=None, user_attributes=None, uuid=None, environment=None): trace_ptr = native_bt.trace_create(self._ptr) if trace_ptr is None: @@ -65,9 +65,9 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping): if uuid is not None: trace._uuid = uuid - if env is not None: - for key, value in env.items(): - trace.env[key] = value + if environment is not None: + for key, value in environment.items(): + trace.environment[key] = value return trace diff --git a/tests/bindings/python/bt2/test_trace.py b/tests/bindings/python/bt2/test_trace.py index 5a927562..0cb3b94e 100644 --- a/tests/bindings/python/bt2/test_trace.py +++ b/tests/bindings/python/bt2/test_trace.py @@ -29,7 +29,7 @@ class TraceTestCase(unittest.TestCase): trace = self._tc() self.assertIsNone(trace.name) self.assertIsNone(trace.uuid) - self.assertEqual(len(trace.env), 0) + self.assertEqual(len(trace.environment), 0) self.assertEqual(len(trace.user_attributes), 0) def test_create_invalid_name(self): @@ -61,15 +61,15 @@ class TraceTestCase(unittest.TestCase): self.assertEqual(trace.uuid, uuid.UUID('da7d6b6f-3108-4706-89bd-ab554732611b')) def test_env_get(self): - trace = self._tc(env={'hello': 'you', 'foo': -5}) - self.assertEqual(trace.env['hello'], 'you') - self.assertEqual(trace.env['foo'], -5) + trace = self._tc(environment={'hello': 'you', 'foo': -5}) + self.assertEqual(trace.environment['hello'], 'you') + self.assertEqual(trace.environment['foo'], -5) def test_env_get_non_existent(self): - trace = self._tc(env={'hello': 'you', 'foo': -5}) + trace = self._tc(environment={'hello': 'you', 'foo': -5}) with self.assertRaises(KeyError): - trace.env['lel'] + trace.environment['lel'] def test_len(self): trace = self._tc() -- 2.34.1