diff options
Diffstat (limited to 'contrib/python/setuptools')
| -rw-r--r-- | contrib/python/setuptools/py2/pkg_resources/__init__.py | 18 | ||||
| -rw-r--r-- | contrib/python/setuptools/py3/pkg_resources/__init__.py | 12 |
2 files changed, 15 insertions, 15 deletions
diff --git a/contrib/python/setuptools/py2/pkg_resources/__init__.py b/contrib/python/setuptools/py2/pkg_resources/__init__.py index 649a2ce651b..0a920ed8ac1 100644 --- a/contrib/python/setuptools/py2/pkg_resources/__init__.py +++ b/contrib/python/setuptools/py2/pkg_resources/__init__.py @@ -3229,8 +3229,8 @@ from library.python import resource class ResProvider(EmptyProvider): - _resource_fs = {} - + _resource_fs = {} + def __init__(self, prefix): if hasattr(prefix, '__file__'): key = prefix.__file__.rsplit('/', 1)[0] @@ -3279,16 +3279,16 @@ class ResProvider(EmptyProvider): return self._resource_fs.get(path) def _listdir(self, path): - result = self.__lookup(path) - if result is None: - return [] - if isinstance(path, six.text_type) and six.PY2: - return [key.decode('utf-8') for key in result] + result = self.__lookup(path) + if result is None: + return [] + if isinstance(path, six.text_type) and six.PY2: + return [key.decode('utf-8') for key in result] else: - return list(result) + return list(result) def _isdir(self, path): - return bool(self.__lookup(path)) + return bool(self.__lookup(path)) class ResDistribution(DistInfoDistribution): diff --git a/contrib/python/setuptools/py3/pkg_resources/__init__.py b/contrib/python/setuptools/py3/pkg_resources/__init__.py index 6b947a49a79..f2b39ed0285 100644 --- a/contrib/python/setuptools/py3/pkg_resources/__init__.py +++ b/contrib/python/setuptools/py3/pkg_resources/__init__.py @@ -3235,8 +3235,8 @@ from library.python import resource class ResProvider(EmptyProvider): - _resource_fs = {} - + _resource_fs = {} + def __init__(self, prefix): if hasattr(prefix, '__file__'): key = prefix.__file__.rsplit('/', 1)[0] @@ -3284,13 +3284,13 @@ class ResProvider(EmptyProvider): return self._resource_fs.get(path) def _listdir(self, path): - result = self.__lookup(path) - if result is None: - return [] + result = self.__lookup(path) + if result is None: + return [] return list(result) def _isdir(self, path): - return bool(self.__lookup(path)) + return bool(self.__lookup(path)) class ResDistribution(DistInfoDistribution): |