Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fix for pyramid 1.4

  • Loading branch information...
commit 4ee384254e80dff90948a65ad4802a846e7f7f32 1 parent 2b64ffd
@mcdonc mcdonc authored
Showing with 7 additions and 2 deletions.
  1. +7 −2 pyramid_handlers/tests.py
View
9 pyramid_handlers/tests.py
@@ -405,8 +405,6 @@ def aview(self): pass
c = list(self._conflictFunctions(why))
self.assertEqual(c[0], 'test_conflict_add_handler')
self.assertEqual(c[1], 'test_conflict_add_handler')
- self.assertEqual(c[2], 'test_conflict_add_handler')
- self.assertEqual(c[3], 'test_conflict_add_handler')
else: # pragma: no cover
raise AssertionError
@@ -597,7 +595,14 @@ def extract_actions(native): # pragma: no cover
return L
def _execute_actions(actions):
+ try:
+ from pyramid.registry import undefer
+ except ImportError: # pragma: no cover
+ def undefer(discriminator):
+ return discriminator
for action in sorted(actions, key=lambda x: x['order']):
+ discriminator = undefer(action['discriminator'])
+ action['discriminator'] = discriminator
if 'callable' in action:
if action['callable']:
action['callable']()

0 comments on commit 4ee3842

Please sign in to comment.
Something went wrong with that request. Please try again.