Chris McDonough
2012-02-07 accd5320fef5801122b29f5d7ee5d0a1dca15119
- Internal: catch unhashable discriminators early (raise an error instead of
allowing them to find their way into resolveConflicts).
2 files modified
10 ■■■■■ changed files
CHANGES.txt 6 ●●●●● patch | view | raw | blame | history
pyramid/config/__init__.py 4 ●●●● patch | view | raw | blame | history
CHANGES.txt
@@ -1,3 +1,9 @@
Next release
============
- Internal: catch unhashable discriminators early (raise an error instead of
  allowing them to find their way into resolveConflicts).
1.2.7 (2012-01-20)
==================
pyramid/config/__init__.py
@@ -432,6 +432,10 @@
        ``order`` is a crude order control mechanism, only rarely used (has
        no effect when autocommit is ``True``).
        """
        # catch nonhashable discriminators here; most unit tests use
        # autocommit=False, which won't catch unhashable discriminators
        assert hash(discriminator)
        if kw is None:
            kw = {}