do not guard against subclasses, maybe_dotted can handle it

fixes #122
Pylons · Nov 1, 2016 · 0b7b171 · 0b7b171
1 parent 0841544
commit 0b7b171
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/pyramid_jinja2/settings.py b/pyramid_jinja2/settings.py
@@ -129,9 +129,7 @@ def sget(name, default=None):
 
     # get supplementary jinja2 settings
     domain = sget('i18n.domain', package and package.__name__ or 'messages')
-    gettext_wrapper = sget('i18n.gettext', GetTextWrapper)
-    if not issubclass(gettext_wrapper, GetTextWrapper):
-        gettext_wrapper = maybe_dotted(gettext_wrapper)
+    gettext_wrapper = maybe_dotted(sget('i18n.gettext', GetTextWrapper))
     opts['gettext'] = gettext_wrapper(domain=domain)
 
     # get jinja2 extensions

diff --git a/pyramid_jinja2/tests/test_ext.py b/pyramid_jinja2/tests/test_ext.py
@@ -1,5 +1,6 @@
 import unittest
 from .base import Base
+from pyramid.path import DottedNameResolver
 
 
 class TestExtensions(Base, unittest.TestCase):
@@ -11,7 +12,8 @@ def test_custom_extension(self):
         options = {
             'extensions': 'pyramid_jinja2.tests.extensions.TestExtension',
         }
-        settings = parse_env_options_from_settings(options, '', None, None)
+        settings = parse_env_options_from_settings(
+            options, '', maybe_dotted, None)
         env = create_environment_from_options(settings, {})
         ext = env.extensions[
             'pyramid_jinja2.tests.extensions.TestExtension']
@@ -23,7 +25,7 @@ def test_i18n(self):
         from pyramid_jinja2 import create_environment_from_options
         from pyramid_jinja2.settings import parse_env_options_from_settings
 
-        settings = parse_env_options_from_settings({}, '', None, None)
+        settings = parse_env_options_from_settings({}, '', maybe_dotted, None)
         env = create_environment_from_options(settings, {})
 
         self.assertTrue(hasattr(env, 'install_gettext_translations'))
@@ -36,6 +38,10 @@ def test_i18n(self):
                          'some untranslated text here\nyay it worked!')
 
 
+resolver = DottedNameResolver()
+maybe_dotted = resolver.maybe_resolve
+
+
 class GetTextWrapperTests(unittest.TestCase):
 
     def test_it(self):