diff options
| author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2018-04-14 19:23:00 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2018-04-14 19:23:00 +0900 |
| commit | 476526fc10046387802899d40f8c4562164990f9 (patch) | |
| tree | dc9181fd20fefafedbbe702423e18f93700e97ff | |
| parent | 7db09e2cbf3a5b1646cac19830e4a65483e73dcb (diff) | |
| download | buildstream-476526fc10046387802899d40f8c4562164990f9.tar.gz | |
element.py: Rename _get_full_display_key() -> _get_display_key()
The extra "full" was a bit redundant here, the Element does not
export any "less than full" display key accessor, so lets use
a more simple name for this.
| -rw-r--r-- | buildstream/_frontend/app.py | 2 | ||||
| -rw-r--r-- | buildstream/_frontend/widget.py | 4 | ||||
| -rw-r--r-- | buildstream/element.py | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/buildstream/_frontend/app.py b/buildstream/_frontend/app.py index 29cedeba8..4d94ff9fa 100644 --- a/buildstream/_frontend/app.py +++ b/buildstream/_frontend/app.py @@ -657,7 +657,7 @@ class App(): queue.enqueue([element]) def shell(self, element, scope, directory, *, mounts=None, isolate=False, command=None): - _, key, dim = element._get_full_display_key() + _, key, dim = element._get_display_key() element_name = element._get_full_name() if self.colors: diff --git a/buildstream/_frontend/widget.py b/buildstream/_frontend/widget.py index ed53d135d..f5e08ad08 100644 --- a/buildstream/_frontend/widget.py +++ b/buildstream/_frontend/widget.py @@ -248,7 +248,7 @@ class CacheKey(Widget): key = ' ' * self.key_length plugin = _plugin_lookup(element_id) if isinstance(plugin, Element): - _, key, missing = plugin._get_full_display_key() + _, key, missing = plugin._get_display_key() if message.message_type in ERROR_MESSAGES: text = self.err_profile.fmt(key) @@ -690,7 +690,7 @@ class LogLine(Widget): for element in dependencies: line = format_ - full_key, cache_key, dim_keys = element._get_full_display_key() + full_key, cache_key, dim_keys = element._get_display_key() line = p.fmt_subst(line, 'name', element._get_full_name(), fg='blue', bold=True) line = p.fmt_subst(line, 'key', cache_key, fg='yellow', dim=dim_keys) diff --git a/buildstream/element.py b/buildstream/element.py index 5cc759394..0f826bd47 100644 --- a/buildstream/element.py +++ b/buildstream/element.py @@ -1058,7 +1058,7 @@ class Element(Plugin): # Strong cache key could not be calculated yet return - # _get_full_display_key(): + # _get_display_key(): # # Returns cache keys for display purposes # @@ -1069,7 +1069,7 @@ class Element(Plugin): # # Question marks are returned if information for the cache key is missing. # - def _get_full_display_key(self): + def _get_display_key(self): context = self._get_context() dim_key = True @@ -1813,7 +1813,7 @@ class Element(Plugin): # Question marks are returned if information for the cache key is missing. # def __get_brief_display_key(self): - _, display_key, _ = self._get_full_display_key() + _, display_key, _ = self._get_display_key() return display_key # __prepare(): |