Преглед на файлове

HUE-8737 [py3] Remove references to basestring

Romain преди 6 години
родител
ревизия
1484b5d4d3
променени са 1 файла, в които са добавени 6 реда и са изтрити 6 реда
  1. 6 6
      desktop/core/src/desktop/lib/python_util.py

+ 6 - 6
desktop/core/src/desktop/lib/python_util.py

@@ -14,15 +14,15 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
-# Extra python utils
 
-from past.builtins import basestring
 from builtins import object
+from six import string_types
+
 import datetime
 import select
 import socket
 import sys
+
 from django.utils.translation import ugettext as _
 from desktop import conf
 from desktop.lib.i18n import smart_str
@@ -52,7 +52,7 @@ class CaseInsensitiveDict(dict):
 
   @classmethod
   def from_dict(cls, _dict):
-    return CaseInsensitiveDict([(isinstance(key, basestring) and key.lower() or key, _dict[key]) for key in _dict])
+    return CaseInsensitiveDict([(isinstance(key, string_types) and key.lower() or key, _dict[key]) for key in _dict])
 
 
 class SynchronousIOMultiplexer(object):
@@ -120,7 +120,7 @@ def force_list_to_strings(lst):
 
   new_list = []
   for item in lst:
-    if isinstance(item, basestring):
+    if isinstance(item, string_types):
       # Strings should not be unicode.
       new_list.append(smart_str(item))
     elif isinstance(item, dict):
@@ -142,7 +142,7 @@ def force_dict_to_strings(dictionary):
   new_dict = {}
   for k in dictionary:
     new_key = smart_str(k)
-    if isinstance(dictionary[k], basestring):
+    if isinstance(dictionary[k], string_types):
       # Strings should not be unicode.
       new_dict[new_key] = smart_str(dictionary[k])
     elif isinstance(dictionary[k], dict):