Merge lp:~rvb/maas/error-msg-format into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Remove '\n' from API error messages.

Trivial drive-by fix that I decided to fix in a separate branch.

[Newell Jensen (newell-jensen)]

review: Approve

=== modified file 'src/maasserver/forms.py'
--- src/maasserver/forms.py	2014-12-11 15:24:55 +0000
+++ src/maasserver/forms.py	2015-01-09 11:12:23 +0000
@@ -609,17 +609,17 @@
             )
 
 
-CLUSTER_NOT_AVAILABLE = mark_safe("""
-The cluster controller for this node is not responding; power type
-validation is not available.
-""")
-
-
-NO_ARCHITECTURES_AVAILABLE = mark_safe("""
-No architectures are available to use for this node; boot images may not
-have been imported on the selected cluster controller, or it may be
-unavailable.
-""")
+CLUSTER_NOT_AVAILABLE = mark_safe(
+    "The cluster controller for this node is not responding; power type "
+    "validation is not available."
+)
+
+
+NO_ARCHITECTURES_AVAILABLE = mark_safe(
+    "No architectures are available to use for this node; boot images may not "
+    "have been imported on the selected cluster controller, or it may be "
+    "unavailable."
+)
 
 
 class AdminNodeForm(NodeForm):