Sfoglia il codice sorgente

HUE-8737 [core] Adopt py3 changes encoding function and open file

Ying Chen 6 anni fa
parent
commit
e0bd664575

+ 6 - 1
apps/beeswax/src/beeswax/templates/list_designs.mako

@@ -14,12 +14,17 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 <%!
+    import sys
     import time
     from django.template.defaultfilters import timesince
-    from django.utils.encoding import force_unicode
     from django.utils.translation import ugettext as _
 
     from desktop.views import commonheader, commonfooter
+
+    if sys.version_info[0] > 2:
+      from django.utils.encoding import force_text as force_unicode
+    else:
+      from django.utils.encoding import force_unicode
 %>
 
 <%namespace name="actionbar" file="actionbar.mako" />

+ 8 - 7
apps/beeswax/src/beeswax/tests.py

@@ -95,9 +95,10 @@ from beeswax.hive_site import get_metastore, hiveserver2_jdbc_url
 
 if sys.version_info[0] > 2:
   from io import StringIO as string_io
+  open_file = open
 else:
   from cStringIO import StringIO as string_io
-
+  open_file = file
 
 LOG = logging.getLogger(__name__)
 
@@ -429,7 +430,7 @@ for x in sys.stdin:
     # BeeswaxTest.jar is gone
     raise SkipTest
 
-    src = file(os.path.join(os.path.dirname(__file__), "..", "..", "java-lib", "BeeswaxTest.jar"))
+    src = open_file(os.path.join(os.path.dirname(__file__), "..", "..", "java-lib", "BeeswaxTest.jar"))
     udf = self.cluster.fs_prefix + "hive1157.jar"
     dest = self.cluster.fs.open(udf, "w")
     shutil.copyfileobj(src, dest)
@@ -2128,7 +2129,7 @@ for x in sys.stdin:
 def test_import_gzip_reader():
   """Test the gzip reader in create table"""
   # Make gzipped data
-  data = file(__file__).read()
+  data = open_file(__file__).read()
   data_gz_sio = string_io()
   gz = gzip.GzipFile(fileobj=data_gz_sio, mode='wb')
   gz.write(data)
@@ -2267,7 +2268,7 @@ def test_hive_site():
         return tmpdir
 
     xml = hive_site_xml(is_local=True, use_sasl=False)
-    file(os.path.join(tmpdir, 'hive-site.xml'), 'w').write(xml)
+    open_file(os.path.join(tmpdir, 'hive-site.xml'), 'w').write(xml)
 
     beeswax.hive_site.reset()
     saved = beeswax.conf.HIVE_CONF_DIR
@@ -2295,7 +2296,7 @@ def test_hive_site_host_pattern_local_host():
 
     thrift_uris = 'thrift://%s:9999' % hostname
     xml = hive_site_xml(is_local=False, use_sasl=False, thrift_uris=thrift_uris, kerberos_principal='test/_HOST@TEST.COM', hs2_kerberos_principal='test/_HOST@TEST.COM')
-    file(os.path.join(tmpdir, 'hive-site.xml'), 'w').write(xml)
+    open_file(os.path.join(tmpdir, 'hive-site.xml'), 'w').write(xml)
 
     beeswax.hive_site.reset()
     saved = beeswax.conf.HIVE_CONF_DIR
@@ -2326,7 +2327,7 @@ def test_hive_site_null_hs2krb():
         return tmpdir
 
     xml = hive_site_xml(is_local=True, use_sasl=False, hs2_kerberos_principal=None)
-    file(os.path.join(tmpdir, 'hive-site.xml'), 'w').write(xml)
+    open_file(os.path.join(tmpdir, 'hive-site.xml'), 'w').write(xml)
 
     beeswax.hive_site.reset()
     saved = beeswax.conf.HIVE_CONF_DIR
@@ -3135,7 +3136,7 @@ def test_metastore_security():
         return tmpdir
 
     xml = hive_site_xml(is_local=False, use_sasl=True, kerberos_principal='hive/_HOST@test.com')
-    file(os.path.join(tmpdir, 'hive-site.xml'), 'w').write(xml)
+    open_file(os.path.join(tmpdir, 'hive-site.xml'), 'w').write(xml)
 
     beeswax.hive_site.reset()
     saved = beeswax.conf.HIVE_CONF_DIR

+ 6 - 1
apps/hbase/src/hbase/hbase_site.py

@@ -18,10 +18,15 @@
 import errno
 import logging
 import os.path
+import sys
 
 from hadoop import confparse
 from desktop.lib.security_util import get_components
 
+if sys.version_info[0] > 2:
+  open_file = open
+else:
+  open_file = file
 
 LOG = logging.getLogger(__name__)
 
@@ -94,7 +99,7 @@ def _parse_site():
   from hbase.conf import HBASE_CONF_DIR
   SITE_PATH = os.path.join(HBASE_CONF_DIR.get(), 'hbase-site.xml')
   try:
-    data = file(SITE_PATH, 'r').read()
+    data = open_file(SITE_PATH, 'r').read()
   except IOError as err:
     if err.errno != errno.ENOENT:
       LOG.error('Cannot read from "%s": %s' % (SITE_PATH, err))

+ 8 - 2
apps/hbase/src/hbase/tests.py

@@ -19,6 +19,7 @@ from builtins import object
 import json
 import os
 import shutil
+import sys
 import tempfile
 
 from nose.tools import assert_true, assert_equal
@@ -34,6 +35,11 @@ from hbase.api import HbaseApi
 from hbase.conf import HBASE_CONF_DIR
 from hbase.hbase_site import get_server_authentication, get_server_principal, get_conf, reset, _CNF_HBASE_IMPERSONATION_ENABLED, is_impersonation_enabled
 
+if sys.version_info[0] > 2:
+  open_file = open
+else:
+  open_file = file
+
 
 def test_security_plain():
   tmpdir = tempfile.mkdtemp()
@@ -41,7 +47,7 @@ def test_security_plain():
 
   try:
     xml = hbase_site_xml()
-    file(os.path.join(tmpdir, 'hbase-site.xml'), 'w').write(xml)
+    open_file(os.path.join(tmpdir, 'hbase-site.xml'), 'w').write(xml)
     reset()
 
     assert_equal('NOSASL', get_server_authentication())
@@ -63,7 +69,7 @@ def test_security_kerberos():
 
   try:
     xml = hbase_site_xml(authentication='kerberos')
-    file(os.path.join(tmpdir, 'hbase-site.xml'), 'w').write(xml)
+    open_file(os.path.join(tmpdir, 'hbase-site.xml'), 'w').write(xml)
     reset()
 
     assert_equal('KERBEROS', get_server_authentication())

+ 6 - 1
apps/impala/src/impala/test_impala_flags.py

@@ -18,12 +18,17 @@
 
 import logging
 import os
+import sys
 import tempfile
 
 from nose.tools import assert_equal
 
 from impala import conf, impala_flags
 
+if sys.version_info[0] > 2:
+  open_file = open
+else:
+  open_file = file
 
 LOG = logging.getLogger(__name__)
 
@@ -47,7 +52,7 @@ def test_impala_flags():
       -max_result_cache_size=%d
       -authorized_proxy_user_config=hue=*
     """ % expected_rows
-    file(os.path.join(test_impala_conf_dir, 'impalad_flags'), 'w').write(flags)
+    open_file(os.path.join(test_impala_conf_dir, 'impalad_flags'), 'w').write(flags)
 
     resets.append(conf.IMPALA_CONF_DIR.set_for_testing(test_impala_conf_dir))
     impala_flags.reset()

+ 7 - 2
apps/sqoop/src/sqoop/test_client.py

@@ -17,6 +17,7 @@
 
 import os
 import shutil
+import sys
 import tempfile
 
 from nose.tools import assert_true, assert_equal, assert_false
@@ -25,6 +26,10 @@ from sqoop.conf import SQOOP_CONF_DIR
 from sqoop.client.base import SqoopClient
 from sqoop.sqoop_properties import reset
 
+if sys.version_info[0] > 2:
+  open_file = open
+else:
+  open_file = file
 
 def test_security_plain():
   tmpdir = tempfile.mkdtemp()
@@ -32,7 +37,7 @@ def test_security_plain():
 
   try:
     xml = sqoop_properties(authentication='SIMPLE')
-    with file(os.path.join(tmpdir, 'sqoop.properties'), 'w') as f:
+    with open_file(os.path.join(tmpdir, 'sqoop.properties'), 'w') as f:
       f.write(xml)
     reset()
 
@@ -50,7 +55,7 @@ def test_security_kerberos():
 
   try:
     xml = sqoop_properties(authentication='KERBEROS')
-    with file(os.path.join(tmpdir, 'sqoop.properties'), 'w') as f:
+    with open_file(os.path.join(tmpdir, 'sqoop.properties'), 'w') as f:
       f.write(xml)
     reset()
 

+ 7 - 1
desktop/core/src/desktop/management/commands/create_desktop_app.py

@@ -19,12 +19,18 @@
 import os
 import re
 import shutil
+import sys
 from django.core.management.base import CommandError, BaseCommand
 from mako.template import Template
 
 import logging
 from django.utils.translation import ugettext as _
 
+if sys.version_info[0] > 2:
+  open_file = open
+else:
+  open_file = file
+
 LOG = logging.getLogger(__name__)
 
 class Command(BaseCommand):
@@ -81,7 +87,7 @@ def copy_template(app_template, copy_to, app_name):
       LOG.info("Writing %s" % path_new)
       fp_new = open(path_new, 'w')
       if path_old.endswith(".png"):
-        shutil.copyfileobj(file(path_old), fp_new)
+        shutil.copyfileobj(open_file(path_old), fp_new)
       else:
         fp_new.write( Template(filename=path_old).render(app_name=app_name, app_name_camel=app_name_camel, app_name_spaces=app_name_spaces) )
       fp_new.close()

+ 7 - 1
desktop/core/src/desktop/management/commands/create_proxy_app.py

@@ -19,12 +19,18 @@
 import os
 import re
 import shutil
+import sys
 from django.core.management.base import CommandError, BaseCommand
 from mako.template import Template
 
 import logging
 from django.utils.translation import ugettext as _
 
+if sys.version_info[0] > 2:
+  open_file = open
+else:
+  open_file = file
+
 LOG = logging.getLogger(__name__)
 
 class Command(BaseCommand):
@@ -83,7 +89,7 @@ def copy_template(app_template, copy_to, app_name, app_url):
       LOG.info("Writing %s" % path_new)
       fp_new = open(path_new, 'w')
       if path_old.endswith(".png"):
-        shutil.copyfileobj(file(path_old), fp_new)
+        shutil.copyfileobj(open_file(path_old), fp_new)
       else:
         fp_new.write( Template(filename=path_old).render(app_name=app_name, app_name_camel=app_name_camel, app_name_spaces=app_name_spaces, app_url=app_url) )
       fp_new.close()

+ 6 - 1
desktop/libs/hadoop/src/hadoop/ssl_client_site.py

@@ -19,10 +19,15 @@ from __future__ import absolute_import
 import errno
 import logging
 import os.path
+import sys
 
 from hadoop import conf
 from hadoop import confparse
 
+if sys.version_info[0] > 2:
+  open_file = open
+else:
+  open_file = file
 
 _SSL_SITE_PATH = None                  # Path to ssl-client.xml
 _SSL_SITE_DICT = None                  # A dictionary of name/value config options
@@ -51,7 +56,7 @@ def _parse_ssl_client_site():
   for indentifier in conf.HDFS_CLUSTERS.get():
     try:
       _SSL_SITE_PATH = os.path.join(conf.HDFS_CLUSTERS[indentifier].HADOOP_CONF_DIR.get(), 'ssl-client.xml')
-      data = file(_SSL_SITE_PATH, 'r').read()
+      data = open_file(_SSL_SITE_PATH, 'r').read()
       break
     except KeyError:
       data = ""

+ 8 - 2
desktop/libs/libsentry/src/libsentry/test_client.py

@@ -17,6 +17,7 @@
 
 import os
 import shutil
+import sys
 import tempfile
 
 from nose.tools import assert_true, assert_equal, assert_false, assert_not_equal, assert_raises
@@ -27,6 +28,11 @@ from libsentry.sentry_site import get_sentry_server_principal,\
   get_sentry_server_admin_groups
 from libsentry.client import SentryClient
 
+if sys.version_info[0] > 2:
+  open_file = open
+else:
+  open_file = file
+
 
 def test_security_plain():
   tmpdir = tempfile.mkdtemp()
@@ -34,7 +40,7 @@ def test_security_plain():
 
   try:
     xml = sentry_site_xml(provider='default')
-    file(os.path.join(tmpdir, 'sentry-site.xml'), 'w').write(xml)
+    open_file(os.path.join(tmpdir, 'sentry-site.xml'), 'w').write(xml)
     sentry_site.reset()
 
     assert_equal('test/test.com@TEST.COM', get_sentry_server_principal())
@@ -57,7 +63,7 @@ def test_security_kerberos():
 
   try:
     xml = sentry_site_xml(provider='default', authentication='kerberos')
-    file(os.path.join(tmpdir, 'sentry-site.xml'), 'w').write(xml)
+    open_file(os.path.join(tmpdir, 'sentry-site.xml'), 'w').write(xml)
     sentry_site.reset()
 
     security = SentryClient('test.com', 11111, 'test')._get_security()

+ 7 - 1
desktop/libs/metadata/src/metadata/metadata_sites_tests.py

@@ -20,6 +20,7 @@ from builtins import object
 import logging
 import os
 import shutil
+import sys
 import tempfile
 
 from nose.tools import assert_equal
@@ -28,6 +29,11 @@ from . import metadata_sites
 from metadata.conf import NAVIGATOR
 from metadata.metadata_sites import get_navigator_server_url
 
+if sys.version_info[0] > 2:
+  open_file = open
+else:
+  open_file = file
+
 LOG = logging.getLogger(__name__)
 
 
@@ -40,7 +46,7 @@ class TestReadConfiguration(object):
     ]
 
     try:
-      file(os.path.join(tmpdir, 'navigator.lineage.client.properties'), 'w').write("""
+      open_file(os.path.join(tmpdir, 'navigator.lineage.client.properties'), 'w').write("""
 navigator.client.serviceType=HUE
 navigator.server.url=http://hue-rocks.com:7187
 navigator.client.roleName=HUE-1-HUE_SERVER-50cf99601c4bf64e9ccded4c8cd96d12