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

HUE-8737 [py3] Remove dependency to old long type

Romain преди 6 години
родител
ревизия
07ccdc17c6
променени са 2 файла, в които са добавени 10 реда и са изтрити 11 реда
  1. 8 9
      desktop/core/src/desktop/lib/conf.py
  2. 2 2
      desktop/libs/dashboard/src/dashboard/facet_builder.py

+ 8 - 9
desktop/core/src/desktop/lib/conf.py

@@ -69,27 +69,26 @@ from six import string_types
 from builtins import object
 from builtins import object
 pytype = type
 pytype = type
 
 
-from django.utils.encoding import smart_str
-from django.utils.translation import ugettext as _
-
-from desktop.lib.paths import get_desktop_root, get_build_dir
-
-from configobj import ConfigObj, ConfigObjError
 import json
 import json
 import logging
 import logging
+import numbers
 import os
 import os
 import textwrap
 import textwrap
 import re
 import re
 import subprocess
 import subprocess
 import sys
 import sys
 
 
+from django.utils.encoding import smart_str
+from django.utils.translation import ugettext as _
+from configobj import ConfigObj, ConfigObjError
+
+from desktop.lib.paths import get_desktop_root, get_build_dir
+
 try:
 try:
   from collections import OrderedDict
   from collections import OrderedDict
 except ImportError:
 except ImportError:
   from ordereddict import OrderedDict # Python 2.6
   from ordereddict import OrderedDict # Python 2.6
 
 
-if sys.version_info[0] > 2:
-  from past.builtins import long
 
 
 # Magical object for use as a "symbol"
 # Magical object for use as a "symbol"
 _ANONYMOUS = ("_ANONYMOUS")
 _ANONYMOUS = ("_ANONYMOUS")
@@ -222,7 +221,7 @@ class Config(object):
     if dynamic_default is not None and not dynamic_default.__doc__ and not private:
     if dynamic_default is not None and not dynamic_default.__doc__ and not private:
       raise ValueError("Dynamic default '%s' must have __doc__ defined!" % (key,))
       raise ValueError("Dynamic default '%s' must have __doc__ defined!" % (key,))
 
 
-    if pytype(default) in (int, long, float, complex, bool) and \
+    if (isinstance(default, numbers.Number) or pytype(default) is bool) and \
           not isinstance(type(default), pytype(default)):
           not isinstance(type(default), pytype(default)):
       raise ValueError("%s: '%s' does not match that of the default value %r (%s)"
       raise ValueError("%s: '%s' does not match that of the default value %r (%s)"
                       % (key, type, default, pytype(default)))
                       % (key, type, default, pytype(default)))

+ 2 - 2
desktop/libs/dashboard/src/dashboard/facet_builder.py

@@ -20,8 +20,8 @@ from __future__ import division
 from __future__ import print_function
 from __future__ import print_function
 from future import standard_library
 from future import standard_library
 standard_library.install_aliases()
 standard_library.install_aliases()
-from builtins import str
-from builtins import range
+
+from builtins import str, range
 import logging
 import logging
 import math
 import math
 import numbers
 import numbers