Просмотр исходного кода

HUE-8737 [core] Use explicit encoding open file to fix failed unit test in py3

Ying Chen 5 лет назад
Родитель
Сommit
2b4ea999b0

+ 4 - 1
apps/beeswax/src/beeswax/tests.py

@@ -2129,7 +2129,10 @@ for x in sys.stdin:
 def test_import_gzip_reader():
   """Test the gzip reader in create table"""
   # Make gzipped data
-  data = open_file(__file__).read()
+  if sys.version_info[0] > 2:
+    data = open(__file__, encoding='utf-8').read()
+  else:
+    data = file(__file__).read()
   data_gz_sio = string_io()
   gz = gzip.GzipFile(fileobj=data_gz_sio, mode='wb')
   gz_data = data

+ 3 - 0
desktop/libs/hadoop/src/hadoop/fs/__init__.py

@@ -172,6 +172,9 @@ class LocalSubFileSystem(object):
       for i in groups:
         newargs[i] = grp.getgrnam(newargs[i]).gr_gid
 
+      if f == builtins_open and sys.version_info[0] > 2:
+        return f(*newargs, encoding='utf-8')
+
       return f(*newargs)
 
     return wrapped