diff --git a/recipes/boost/all/conanfile.py b/recipes/boost/all/conanfile.py index d6940cfb714f9e..1230110af5c338 100644 --- a/recipes/boost/all/conanfile.py +++ b/recipes/boost/all/conanfile.py @@ -188,7 +188,7 @@ def _dependencies(self): dependencies_filepath = os.path.join(self.recipe_folder, "dependencies", self._dependency_filename) if not os.path.isfile(dependencies_filepath): raise ConanException("Cannot find {}".format(dependencies_filepath)) - self._cached_dependencies = yaml.safe_load(open(dependencies_filepath)) + self._cached_dependencies = yaml.safe_load(open(dependencies_filepath, encoding='utf-8')) return self._cached_dependencies def _all_dependent_modules(self, name): @@ -760,7 +760,7 @@ def _clean(self): ] for d in clean_dirs: if os.path.isdir(d): - self.output.warn("removing '%s'".format(d)) + self.output.warn("removing '{}'".format(d)) shutil.rmtree(d) @property @@ -953,11 +953,11 @@ def _gnu_cxx11_abi(self): determined. """ try: - if str(self.settings.compiler.libcxx) == "libstdc++": + if str(self.settings.compiler.libcxxxxx) == "libstdc++": return "0" - elif str(self.settings.compiler.libcxx) == "libstdc++11": + elif str(self.settings.compiler.libcxxssss) == "libstdc++11": return "1" - except: + except ConanException: pass return None @@ -1068,7 +1068,7 @@ def add_defines(library): }.get(str(self.settings.compiler.libcxx), str(self.settings.compiler.libcxx)) cxx_flags.append("-stdlib={}".format(libcxx)) link_flags.append("-stdlib={}".format(libcxx)) - except: + except ConanException: pass if self.options.error_code_header_only: @@ -1333,7 +1333,6 @@ def _toolset_tag(self): # Visual Studio | 17 | Windows | vc142 | depends on compiler.toolset compiler = { "apple-clang": "", - "msvc": "vc", "Visual Studio": "vc", "msvc": "vc", }.get(str(self.settings.compiler), str(self.settings.compiler))