summaryrefslogtreecommitdiff
path: root/repoze/bfg/configuration.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-12-09 01:21:21 +0000
committerChris McDonough <chrism@agendaless.com>2009-12-09 01:21:21 +0000
commita294cdfef34cda587d288a457c9a2e7bf760e916 (patch)
treea522d838a6e98832a5ed8bf934eabdbc07a3cd98 /repoze/bfg/configuration.py
parent05d6f55437971a7059ea82e6fd3f6dedb4202ba5 (diff)
downloadpyramid-a294cdfef34cda587d288a457c9a2e7bf760e916.tar.gz
pyramid-a294cdfef34cda587d288a457c9a2e7bf760e916.tar.bz2
pyramid-a294cdfef34cda587d288a457c9a2e7bf760e916.zip
- The exception class representing the error raised by various methods
of a ``Configurator`` is now importable as ``repoze.bfg.exceptions.ConfigurationError``.
Diffstat (limited to 'repoze/bfg/configuration.py')
-rw-r--r--repoze/bfg/configuration.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/repoze/bfg/configuration.py b/repoze/bfg/configuration.py
index b858f405a..6cb4feb8d 100644
--- a/repoze/bfg/configuration.py
+++ b/repoze/bfg/configuration.py
@@ -6,7 +6,6 @@ import inspect
from webob import Response
-from zope.configuration.exceptions import ConfigurationError
from zope.configuration import xmlconfig
from zope.interface import Interface
@@ -41,6 +40,7 @@ from repoze.bfg.compat import walk_packages
from repoze.bfg.events import WSGIApplicationCreatedEvent
from repoze.bfg.exceptions import Forbidden
from repoze.bfg.exceptions import NotFound
+from repoze.bfg.exceptions import ConfigurationError
from repoze.bfg.log import make_stream_logger
from repoze.bfg.path import caller_package
from repoze.bfg.registry import Registry
@@ -266,8 +266,8 @@ class Configurator(object):
authorization = ACLAuthorizationPolicy() # default
if authorization and not authentication:
raise ConfigurationError(
- 'If the "authorization" is passed a vallue, '
- 'the "authentication" argument musty also be '
+ 'If the "authorization" is passed a value, '
+ 'the "authentication" argument must also be '
'passed a value; authorization requires authentication.')
self._set_authentication_policy(authentication)
self._set_authorization_policy(authorization)