Skip to content

Commit 320d184

Browse files
committed
EntryPoints: replace calls to .load() with .resolve()
.resolve() is available from setuptools 11.3 forward (released in 2015), does the same thing as .load(), but ommits the requirements check.
1 parent 352f051 commit 320d184

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Orange/canvas/application/workflows/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def example_workflows():
4646
for ep in workflow_entry_points():
4747
workflows = None
4848
try:
49-
workflows = ep.load()
49+
workflows = ep.resolve()
5050
except pkg_resources.DistributionNotFound as ex:
5151
log.warning("Could not load workflows from %r (%r)",
5252
ep.dist, ex)

Orange/canvas/help/manager.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ def qurl_from_path(urlpath):
270270

271271

272272
def create_intersphinx_provider(entry_point):
273-
locations = entry_point.load()
273+
locations = entry_point.resolve()
274274
replacements = _replacements_for_dist(entry_point.dist)
275275

276276
formatter = string.Formatter()
@@ -317,7 +317,7 @@ def create_intersphinx_provider(entry_point):
317317

318318

319319
def create_html_provider(entry_point):
320-
locations = entry_point.load()
320+
locations = entry_point.resolve()
321321
replacements = _replacements_for_dist(entry_point.dist)
322322

323323
formatter = string.Formatter()
@@ -350,7 +350,7 @@ def create_html_provider(entry_point):
350350

351351

352352
def create_html_inventory_provider(entry_point):
353-
locations = entry_point.load()
353+
locations = entry_point.resolve()
354354
replacements = _replacements_for_dist(entry_point.dist)
355355

356356
formatter = string.Formatter()

Orange/canvas/registry/discovery.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def run(self, entry_points_iter):
8686

8787
for entry_point in entry_points_iter:
8888
try:
89-
point = entry_point.load()
89+
point = entry_point.resolve()
9090
except pkg_resources.DistributionNotFound:
9191
log.error("Could not load '%s' (unsatisfied dependencies).",
9292
entry_point, exc_info=True)

0 commit comments

Comments
 (0)