Browse Source

HUE-8737 [py3] Remove basestring in lib conf

Romain 6 years ago
parent
commit
680299fa91
1 changed files with 4 additions and 4 deletions
  1. 4 4
      desktop/core/src/desktop/lib/conf.py

+ 4 - 4
desktop/core/src/desktop/lib/conf.py

@@ -65,7 +65,7 @@ variables.
 # using it. So instead of breaking compatibility, we make a "pytype" alias.
 # using it. So instead of breaking compatibility, we make a "pytype" alias.
 
 
 from __future__ import print_function
 from __future__ import print_function
-from past.builtins import basestring
+from six import string_types
 from builtins import object
 from builtins import object
 pytype = type
 pytype = type
 
 
@@ -629,7 +629,7 @@ def coerce_bool(value):
   if isinstance(value, bool):
   if isinstance(value, bool):
     return value
     return value
 
 
-  if isinstance(value, basestring):
+  if isinstance(value, string_types):
     upper = value.upper()
     upper = value.upper()
   else:
   else:
     upper = value
     upper = value
@@ -654,7 +654,7 @@ def coerce_csv(value):
   raise Exception("Could not coerce %r to csv array." % value)
   raise Exception("Could not coerce %r to csv array." % value)
 
 
 def coerce_json_dict(value):
 def coerce_json_dict(value):
-  if isinstance(value, basestring):
+  if isinstance(value, string_types):
     return json.loads(value)
     return json.loads(value)
   elif isinstance(value, dict):
   elif isinstance(value, dict):
     return value
     return value
@@ -662,7 +662,7 @@ def coerce_json_dict(value):
 
 
 def list_of_compiled_res(skip_empty=False):
 def list_of_compiled_res(skip_empty=False):
   def fn(list_of_strings):
   def fn(list_of_strings):
-    if isinstance(list_of_strings, basestring):
+    if isinstance(list_of_strings, string_types):
       list_of_strings = list_of_strings.split(',')
       list_of_strings = list_of_strings.split(',')
     list_of_strings = [string if skip_empty else True for string in list_of_strings]
     list_of_strings = [string if skip_empty else True for string in list_of_strings]
     return list(re.compile(x) for x in list_of_strings)
     return list(re.compile(x) for x in list_of_strings)