From c768a99151e47c3a4bb7b92c514d256abd301c4d Mon Sep 17 00:00:00 2001 From: dvshkurko Date: Thu, 10 Feb 2022 16:45:52 +0300 Subject: Restoring authorship annotation for . Commit 2 of 2. --- contrib/python/setuptools/py2/pkg_resources/__init__.py | 10 +++++----- contrib/python/setuptools/py3/pkg_resources/__init__.py | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'contrib/python/setuptools') diff --git a/contrib/python/setuptools/py2/pkg_resources/__init__.py b/contrib/python/setuptools/py2/pkg_resources/__init__.py index c44ac121299..649a2ce651b 100644 --- a/contrib/python/setuptools/py2/pkg_resources/__init__.py +++ b/contrib/python/setuptools/py2/pkg_resources/__init__.py @@ -3278,19 +3278,19 @@ class ResProvider(EmptyProvider): path = os.path.normpath(path) return self._resource_fs.get(path) - def _listdir(self, 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] - else: + else: return list(result) - def _isdir(self, path): + def _isdir(self, path): return bool(self.__lookup(path)) - - + + class ResDistribution(DistInfoDistribution): def __init__(self, prefix): super(ResDistribution, self).__init__( diff --git a/contrib/python/setuptools/py3/pkg_resources/__init__.py b/contrib/python/setuptools/py3/pkg_resources/__init__.py index 43b2459c60f..6b947a49a79 100644 --- a/contrib/python/setuptools/py3/pkg_resources/__init__.py +++ b/contrib/python/setuptools/py3/pkg_resources/__init__.py @@ -3283,16 +3283,16 @@ class ResProvider(EmptyProvider): path = os.path.normpath(path) return self._resource_fs.get(path) - def _listdir(self, path): + def _listdir(self, path): result = self.__lookup(path) if result is None: return [] return list(result) - def _isdir(self, path): + def _isdir(self, path): return bool(self.__lookup(path)) - - + + class ResDistribution(DistInfoDistribution): def __init__(self, prefix): super(ResDistribution, self).__init__( -- cgit v1.3