فهرست منبع

HUE-2915 [fb] FS util function path seems to not exist

Replace by parent Hadoop normpath.
Romain Rigaux 10 سال پیش
والد
کامیت
06847d3
3فایلهای تغییر یافته به همراه8 افزوده شده و 6 حذف شده
  1. 1 1
      apps/filebrowser/src/filebrowser/forms.py
  2. 3 2
      desktop/libs/aws/src/aws/s3/__init__.py
  3. 4 3
      desktop/libs/aws/src/aws/s3/s3fs.py

+ 1 - 1
apps/filebrowser/src/filebrowser/forms.py

@@ -24,7 +24,7 @@ from django.forms import FileField, CharField, BooleanField, Textarea
 from django.forms.formsets import formset_factory, BaseFormSet
 
 from desktop.lib import i18n
-from desktop.lib.fs.utils import normpath
+from hadoop.fs import normpath
 from filebrowser.lib import rwx
 
 from django.utils.translation import ugettext_lazy as _

+ 3 - 2
desktop/libs/aws/src/aws/s3/__init__.py

@@ -24,9 +24,10 @@ import sys
 import time
 
 from functools import wraps
+
 from boto.exception import S3ResponseError
+from hadoop.fs import normpath
 
-from desktop.lib.fs import utils as fs_utils
 
 ERRNO_MAP = {
   403: errno.EACCES,
@@ -84,7 +85,7 @@ def abspath(cd, uri):
   abspath('s3://bucket/key', 's3://bucket2/key2') == 's3://bucket2/key2'
   """
   if not uri.lower().startswith(S3_ROOT):
-    uri = fs_utils.normpath(join(cd, '..', uri))
+    uri = normpath(join(cd, '..', uri))
   return uri
 
 

+ 4 - 3
desktop/libs/aws/src/aws/s3/s3fs.py

@@ -32,7 +32,8 @@ from aws import s3
 from aws.s3 import translate_s3_error, s3file
 from aws.s3.s3stat import S3Stat
 
-from desktop.lib.fs import utils as fs_utils
+from hadoop.fs import normpath
+
 
 DEFAULT_READ_SIZE = 1024 * 1024  # 1MB
 LOG = logging.getLogger(__name__)
@@ -114,7 +115,7 @@ class S3FileSystem(object):
 
   @staticmethod
   def normpath(path):
-    return fs_utils.normpath(path)
+    return normpath(path)
 
   @translate_s3_error
   def open(self, path, mode='r'):
@@ -149,7 +150,7 @@ class S3FileSystem(object):
 
   @translate_s3_error
   def stats(self, path):
-    path = fs_utils.normpath(path)
+    path = normpath(path)
     stats = self._stats(path)
     if stats:
       return stats