Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
setuptools
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
setuptools
Commits
58ad1e14
Commit
58ad1e14
authored
May 15, 2018
by
jeffrey k eliasen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
python 2.7 does not implement object.__dir__()
parent
1a90187c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
0 deletions
+15
-0
pkg_resources/__init__.py
pkg_resources/__init__.py
+4
-0
pkg_resources/tests/test_resources.py
pkg_resources/tests/test_resources.py
+11
-0
No files found.
pkg_resources/__init__.py
View file @
58ad1e14
...
@@ -2676,6 +2676,10 @@ class Distribution(object):
...
@@ -2676,6 +2676,10 @@ class Distribution(object):
)
)
)
)
if
not
hasattr
(
object
,
'__dir__'
):
# python 2.7 not supported
del
__dir__
@
classmethod
@
classmethod
def
from_filename
(
cls
,
filename
,
metadata
=
None
,
**
kw
):
def
from_filename
(
cls
,
filename
,
metadata
=
None
,
**
kw
):
return
cls
.
from_location
(
return
cls
.
from_location
(
...
...
pkg_resources/tests/test_resources.py
View file @
58ad1e14
...
@@ -145,6 +145,16 @@ class TestDistro:
...
@@ -145,6 +145,16 @@ class TestDistro:
for
v
in
"Twisted>=1.5"
,
"Twisted>=1.5
\
n
ZConfig>=2.0"
:
for
v
in
"Twisted>=1.5"
,
"Twisted>=1.5
\
n
ZConfig>=2.0"
:
self
.
checkRequires
(
self
.
distRequires
(
v
),
v
)
self
.
checkRequires
(
self
.
distRequires
(
v
),
v
)
needs_object_dir
=
pytest
.
mark
.
skipif
(
not
hasattr
(
object
,
'__dir__'
),
reason
=
'object.__dir__ necessary for self.__dir__ implementation'
,
)
def
test_distribution_dir
(
self
):
d
=
pkg_resources
.
Distribution
()
dir
(
d
)
@
needs_object_dir
def
test_distribution_dir_includes_provider_dir
(
self
):
def
test_distribution_dir_includes_provider_dir
(
self
):
d
=
pkg_resources
.
Distribution
()
d
=
pkg_resources
.
Distribution
()
before
=
d
.
__dir__
()
before
=
d
.
__dir__
()
...
@@ -154,6 +164,7 @@ class TestDistro:
...
@@ -154,6 +164,7 @@ class TestDistro:
assert
len
(
after
)
==
len
(
before
)
+
1
assert
len
(
after
)
==
len
(
before
)
+
1
assert
'test_attr'
in
after
assert
'test_attr'
in
after
@
needs_object_dir
def
test_distribution_dir_ignores_provider_dir_leading_underscore
(
self
):
def
test_distribution_dir_ignores_provider_dir_leading_underscore
(
self
):
d
=
pkg_resources
.
Distribution
()
d
=
pkg_resources
.
Distribution
()
before
=
d
.
__dir__
()
before
=
d
.
__dir__
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment