diff options
| author | Michael Merickel <michael@merickel.org> | 2020-01-03 23:14:53 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2020-01-03 23:14:53 -0600 |
| commit | 828e069de5d0c98e6d54cfdbf20b1a8acd1f6b39 (patch) | |
| tree | be692270de956199b4cfb1eda8a9fc24ceb8374e /tests/test_config/test_actions.py | |
| parent | 7820b922cc1b87147cc60288dff0bbdfd7b5bc8a (diff) | |
| parent | 148cf5138638ce6b1b92b4e13fe1444df9451e34 (diff) | |
| download | pyramid-828e069de5d0c98e6d54cfdbf20b1a8acd1f6b39.tar.gz pyramid-828e069de5d0c98e6d54cfdbf20b1a8acd1f6b39.tar.bz2 pyramid-828e069de5d0c98e6d54cfdbf20b1a8acd1f6b39.zip | |
Merge branch 'master' into security-docs
Diffstat (limited to 'tests/test_config/test_actions.py')
| -rw-r--r-- | tests/test_config/test_actions.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/test_config/test_actions.py b/tests/test_config/test_actions.py index a72d0d7b1..aa86f3792 100644 --- a/tests/test_config/test_actions.py +++ b/tests/test_config/test_actions.py @@ -1,8 +1,9 @@ import unittest -from pyramid.exceptions import ConfigurationConflictError -from pyramid.exceptions import ConfigurationExecutionError - +from pyramid.exceptions import ( + ConfigurationConflictError, + ConfigurationExecutionError, +) from pyramid.interfaces import IRequest |