From fa928e803bc41f1e49051bb0cb738acbd8c6f2ec Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Thu, 13 Feb 2020 19:05:29 +0000 Subject: Remove unused MesonException.get_msg_with_context() After that, the only remaining user of get_error_location_string() is mlog, so move that there. --- mesonbuild/mesonlib.py | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'mesonbuild/mesonlib.py') diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py index e09d123..854c934 100644 --- a/mesonbuild/mesonlib.py +++ b/mesonbuild/mesonlib.py @@ -122,13 +122,6 @@ an_unpicklable_object = threading.Lock() class MesonException(Exception): '''Exceptions thrown by Meson''' - def get_msg_with_context(self): - s = '' - if hasattr(self, 'lineno') and hasattr(self, 'file'): - s = get_error_location_string(self.file, self.lineno) + ' ' - s += str(self) - return s - class EnvironmentException(MesonException): '''Exceptions thrown while processing and creating the build environment''' @@ -1339,16 +1332,6 @@ def detect_subprojects(spdir_name, current_dir='', result=None): result[basename] = [trial] return result -# This isn't strictly correct. What we really want here is something like: -# class StringProtocol(typing_extensions.Protocol): -# -# def __str__(self) -> str: ... -# -# This would more accurately embody what this funcitonc an handle, but we -# don't have that yet, so instead we'll do some casting to work around it -def get_error_location_string(fname: str, lineno: str) -> str: - return '{}:{}:'.format(fname, lineno) - def substring_is_in_list(substr: str, strlist: T.List[str]) -> bool: for s in strlist: if substr in s: -- cgit v1.1