Skip to content
Open
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
8 changes: 8 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,17 @@ Bug Fixes
Backward Incompatibilities
--------------------------

- Replace ``pyramid.util.DottedNameResolver`` with a shim. Users should use
``pyramid.path.DottedNameResolver`` instead. See
https://github.com/Pylons/pyramid/pull/3837.

Deprecations
------------

- Deprecate ``pyramid.util.DottedNameResolver`` in favor of
``pyramid.path.DottedNameResolver``. See
https://github.com/Pylons/pyramid/pull/3837.

Documentation Changes
---------------------

Expand Down
3 changes: 2 additions & 1 deletion src/pyramid/scripts/pshell.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
import textwrap

from pyramid.paster import bootstrap
from pyramid.path import DottedNameResolver
from pyramid.scripts.common import get_config_loader, parse_vars
from pyramid.settings import aslist
from pyramid.util import DottedNameResolver, make_contextmanager
from pyramid.util import make_contextmanager


def main(argv=sys.argv, quiet=False):
Expand Down
27 changes: 20 additions & 7 deletions src/pyramid/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
import inspect
import platform
import weakref

from pyramid.path import DottedNameResolver as _DottedNameResolver
from zope.deprecation import deprecated

_marker = object()

Expand All @@ -20,11 +19,25 @@
PYPY = False


class DottedNameResolver(_DottedNameResolver):
def __init__(
self, package=None
): # default to package = None for bw compat
_DottedNameResolver.__init__(self, package)
def DottedNameResolver(package=None):
"""
.. deprecated:: 2.2

Please use :class:`pyramid.path.DottedNameResolver` instead.

"""
from pyramid.path import DottedNameResolver as _DottedNameResolver

return _DottedNameResolver(package)


deprecated(
'DottedNameResolver',
(
'`pyramid.util.DottedNameResolver` has been moved to '
'`pyramid.path.DottedNameResolver`.'
),
)


def text_(s, encoding='latin-1', errors='strict'):
Expand Down
35 changes: 35 additions & 0 deletions tests/test_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,41 @@
from pyramid.util import bytes_, text_


class TestDottedNameResolver(unittest.TestCase):
def _makeOne(self, *args):
from pyramid.util import DottedNameResolver

return DottedNameResolver(*args)

def test_resolve(self):
"""
Test that basic resolver functionality works as expected.
"""
import tests.test_util

resolver = self._makeOne()
result = resolver.resolve('tests.test_util')
self.assertEqual(result, tests.test_util)

def test_package_none(self):
"""
Test that package defaults to ``None``, rather than new behavior of
``caller_package``.
"""
resolver = self._makeOne()
self.assertRaises(ValueError, resolver.resolve, '.test_util')

def test_package_explicit(self):
"""
Test that package argument is honored.
"""
import tests.test_util

resolver = self._makeOne('tests')
result = resolver.resolve('.test_util')
self.assertEqual(result, tests.test_util)


class Test_InstancePropertyHelper(unittest.TestCase):
def _makeOne(self):
cls = self._getTargetClass()
Expand Down
Loading