Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/pyramid/asset.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import os
import pkg_resources

from pyramid.path import package_name, package_path
from pyramid.path import package_name, package_path, resource_filename


def resolve_asset_spec(spec, pname='__main__'):
Expand Down Expand Up @@ -40,4 +39,4 @@ def abspath_from_asset_spec(spec, pname='__main__'):
pname, filename = resolve_asset_spec(spec, pname)
if pname is None:
return filename
return pkg_resources.resource_filename(pname, filename)
return resource_filename(pname, filename)
3 changes: 2 additions & 1 deletion src/pyramid/config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@
IDebugLogger,
IExceptionResponse,
)
from pyramid.path import DottedNameResolver, caller_package, package_of
from pyramid.path import caller_package, package_of
from pyramid.registry import Introspectable, Introspector, Registry
from pyramid.resolver import DottedNameResolver
from pyramid.router import Router
from pyramid.settings import aslist
from pyramid.threadlocal import manager
Expand Down
2 changes: 1 addition & 1 deletion src/pyramid/config/i18n.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from pyramid.config.actions import action_method
from pyramid.exceptions import ConfigurationError
from pyramid.interfaces import ILocaleNegotiator, ITranslationDirectories
from pyramid.path import AssetResolver
from pyramid.resolver import AssetResolver


class I18NConfiguratorMixin:
Expand Down
Loading
Loading