From c8bc128039bcad9e28d9c6ad5cd723fd6bf0cb13 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Fri, 12 Aug 2016 12:02:20 +0200 Subject: [PATCH] type_is_str(): make pyflakes3 happy pyflakes3 doesn't check sys.version and therefore complains about 'unicode' being undefined. This patch defines unicode as alias of str to make pyflakes3 happy, and as a side effect, simplifies type_is_str(). Acked-by: Seth Arnold for trunk and 2.10. --- utils/apparmor/common.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/utils/apparmor/common.py b/utils/apparmor/common.py index fbba89edf..a06d4ba07 100644 --- a/utils/apparmor/common.py +++ b/utils/apparmor/common.py @@ -245,11 +245,12 @@ def user_perm(prof_dir): return False return True +if sys.version_info[0] > 2: + unicode = str # python 3 dropped the unicode type. To keep type_is_str() simple (and pyflakes3 happy), re-create it as alias of str. + def type_is_str(var): ''' returns True if the given variable is a str (or unicode string when using python 2)''' - if type(var) == str: - return True - elif sys.version_info[0] < 3 and type(var) == unicode: # python 2 sometimes uses the 'unicode' type + if type(var) in [str, unicode]: # python 2 sometimes uses the 'unicode' type return True else: return False