From fa56370bd291f4f6dc3ccdab48974d7ce3aa5b51 Mon Sep 17 00:00:00 2001 From: Michka Popoff Date: Mon, 21 Aug 2023 22:17:34 +0200 Subject: [PATCH] Deprecate utils.is_str We don't support Python 2 since a long time now --- src/pygccxml/declarations/container_traits.py | 4 ++-- src/pygccxml/declarations/type_traits.py | 8 ++++---- src/pygccxml/parser/config.py | 3 +-- src/pygccxml/parser/linker.py | 3 +-- src/pygccxml/parser/project_reader.py | 4 ++-- src/pygccxml/parser/scanner.py | 2 +- src/pygccxml/utils/utils.py | 5 +++++ unittests/find_container_traits_tester.py | 3 +-- 8 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/pygccxml/declarations/container_traits.py b/src/pygccxml/declarations/container_traits.py index 92ad175b..d4f6658e 100644 --- a/src/pygccxml/declarations/container_traits.py +++ b/src/pygccxml/declarations/container_traits.py @@ -522,7 +522,7 @@ def remove_defaults(self, type_or_string): """ name = type_or_string - if not utils.is_str(type_or_string): + if not isinstance(type_or_string, str): name = self.class_declaration(type_or_string).name if not self.remove_defaults_impl: return name @@ -705,7 +705,7 @@ def find_container_traits(cls_or_string): declarations.container_traits: a container traits """ - if utils.is_str(cls_or_string): + if isinstance(cls_or_string, str): if not templates.is_instantiation(cls_or_string): return None name = templates.name(cls_or_string) diff --git a/src/pygccxml/declarations/type_traits.py b/src/pygccxml/declarations/type_traits.py index eef8fe7a..bc9be8de 100644 --- a/src/pygccxml/declarations/type_traits.py +++ b/src/pygccxml/declarations/type_traits.py @@ -507,7 +507,7 @@ def is_std_string(type_): """ - if utils.is_str(type_): + if isinstance(type_, str): return type_ in string_equivalences type_ = remove_alias(type_) @@ -522,7 +522,7 @@ def is_std_wstring(type_): """ - if utils.is_str(type_): + if isinstance(type_, str): return type_ in wstring_equivalences type_ = remove_alias(type_) @@ -537,7 +537,7 @@ def is_std_ostream(type_): """ - if utils.is_str(type_): + if isinstance(type_, str): return type_ in ostream_equivalences type_ = remove_alias(type_) @@ -552,7 +552,7 @@ def is_std_wostream(type_): """ - if utils.is_str(type_): + if isinstance(type_, str): return type_ in wostream_equivalences type_ = remove_alias(type_) diff --git a/src/pygccxml/parser/config.py b/src/pygccxml/parser/config.py index e2b9eea4..e2db56d8 100644 --- a/src/pygccxml/parser/config.py +++ b/src/pygccxml/parser/config.py @@ -22,7 +22,6 @@ from ConfigParser import SafeConfigParser as ConfigParser except ImportError: from configparser import ConfigParser -from .. import utils class parser_configuration_t(object): @@ -383,7 +382,7 @@ def load_xml_generator_configuration(configuration, **defaults): """ parser = configuration - if utils.is_str(configuration): + if isinstance(configuration, str): parser = ConfigParser() parser.read(configuration) diff --git a/src/pygccxml/parser/linker.py b/src/pygccxml/parser/linker.py index b7aeda3b..1677e27f 100644 --- a/src/pygccxml/parser/linker.py +++ b/src/pygccxml/parser/linker.py @@ -4,7 +4,6 @@ # See http://www.boost.org/LICENSE_1_0.txt from pygccxml import declarations -from .. import utils class linker_t( @@ -304,7 +303,7 @@ def visit_member_variable_type(self): self.__link_compound_type() def visit_declarated(self): - if utils.is_str(self.__inst.declaration): + if isinstance(self.__inst.declaration, str): self.__inst.declaration = self.__decls[self.__inst.declaration] def visit_restrict(self): diff --git a/src/pygccxml/parser/project_reader.py b/src/pygccxml/parser/project_reader.py index a6287907..d7bf7c99 100644 --- a/src/pygccxml/parser/project_reader.py +++ b/src/pygccxml/parser/project_reader.py @@ -187,7 +187,7 @@ def __init__(self, config, cache=None, decl_factory=None): self.__dcache = None if isinstance(cache, declarations_cache.cache_base_t): self.__dcache = cache - elif utils.is_str(cache): + elif isinstance(cache, str): self.__dcache = declarations_cache.file_cache_t(cache) else: self.__dcache = declarations_cache.dummy_cache_t() @@ -221,7 +221,7 @@ def get_os_file_names(files): fnames = [] for f in files: - if utils.is_str(f): + if isinstance(f, str): fnames.append(f) elif isinstance(f, file_configuration_t): if f.content_type in ( diff --git a/src/pygccxml/parser/scanner.py b/src/pygccxml/parser/scanner.py index 4368a84a..63f9cbd7 100644 --- a/src/pygccxml/parser/scanner.py +++ b/src/pygccxml/parser/scanner.py @@ -334,7 +334,7 @@ def startElement(self, name, attrs): self.__update_membership(attrs) self.__read_attributes(obj, attrs) - elif utils.is_str(obj): + elif isinstance(obj, str): self.__files[element_id] = os.path.normpath(obj) diff --git a/src/pygccxml/utils/utils.py b/src/pygccxml/utils/utils.py index 21bb5d3c..2221e598 100644 --- a/src/pygccxml/utils/utils.py +++ b/src/pygccxml/utils/utils.py @@ -26,6 +26,11 @@ def is_str(string): bool: True or False """ + warnings.warn( + "The is_str function is deprecated. \ + Use isinstance(string, str) instead.", + DeprecationWarning) + if sys.version_info[:2] >= (3, 0): return isinstance(string, str) diff --git a/unittests/find_container_traits_tester.py b/unittests/find_container_traits_tester.py index c6eebce5..1571c373 100644 --- a/unittests/find_container_traits_tester.py +++ b/unittests/find_container_traits_tester.py @@ -9,7 +9,6 @@ from pygccxml import parser from pygccxml import declarations -from pygccxml import utils class Test(parser_test_case.parser_test_case_t): @@ -30,7 +29,7 @@ def setUp(self): self.global_ns = Test.global_ns def __cmp_traits(self, typedef, expected, partial_name, key_type=None): - if utils.is_str(typedef): + if isinstance(typedef, str): typedef = self.global_ns.typedef(typedef) traits = declarations.find_container_traits(typedef) self.assertTrue(