summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/pyramid/config/views.py2
-rw-r--r--src/pyramid/httpexceptions.py4
-rw-r--r--src/pyramid/interfaces.py6
-rw-r--r--src/pyramid/scripts/proutes.py2
4 files changed, 6 insertions, 8 deletions
diff --git a/src/pyramid/config/views.py b/src/pyramid/config/views.py
index be7d331b4..1abff0579 100644
--- a/src/pyramid/config/views.py
+++ b/src/pyramid/config/views.py
@@ -859,7 +859,7 @@ class ViewsConfiguratorMixin(object):
else:
raise ConfigurationError(
- '"view" was not specified and ' 'no "renderer" specified'
+ '"view" was not specified and no "renderer" specified'
)
if request_type is not None:
diff --git a/src/pyramid/httpexceptions.py b/src/pyramid/httpexceptions.py
index 8dfb279ad..c9fdfe04b 100644
--- a/src/pyramid/httpexceptions.py
+++ b/src/pyramid/httpexceptions.py
@@ -914,9 +914,7 @@ class HTTPConflict(HTTPClientError):
code = 409
title = 'Conflict'
- explanation = (
- 'There was a conflict when trying to complete ' 'your request.'
- )
+ explanation = 'There was a conflict when trying to complete your request.'
class HTTPGone(HTTPClientError):
diff --git a/src/pyramid/interfaces.py b/src/pyramid/interfaces.py
index f1e238c6b..638c1a9fd 100644
--- a/src/pyramid/interfaces.py
+++ b/src/pyramid/interfaces.py
@@ -426,7 +426,7 @@ class IRendererInfo(Interface):
)
type = Attribute('The renderer type name')
registry = Attribute(
- 'The "current" application registry when the ' 'renderer was created'
+ 'The "current" application registry when the renderer was created'
)
settings = Attribute(
'The deployment settings dictionary related '
@@ -1274,7 +1274,7 @@ class IIntrospectable(Interface):
)
category_name = Attribute('introspection category name')
discriminator = Attribute(
- 'introspectable discriminator (within category) ' '(must be hashable)'
+ 'introspectable discriminator (within category) (must be hashable)'
)
discriminator_hash = Attribute('an integer hash of the discriminator')
action_info = Attribute(
@@ -1415,7 +1415,7 @@ class IViewDeriverInfo(Interface):
:term:`view deriver` during configuration."""
registry = Attribute(
- 'The "current" application registry where the ' 'view was created'
+ 'The "current" application registry where the view was created'
)
package = Attribute(
'The "current package" where the view '
diff --git a/src/pyramid/scripts/proutes.py b/src/pyramid/scripts/proutes.py
index 78c2295d5..189b125ce 100644
--- a/src/pyramid/scripts/proutes.py
+++ b/src/pyramid/scripts/proutes.py
@@ -285,7 +285,7 @@ class PRoutesCommand(object):
if fmt not in self.available_formats:
invalid_formats.append(fmt)
- msg = 'You provided invalid formats %s, ' 'Available formats are %s'
+ msg = 'You provided invalid formats %s. Available formats are %s'
if invalid_formats:
msg = msg % (invalid_formats, self.available_formats)