[#6554] let ProjectConflict be constructed with a single string, like it did before adding Invalid as a parent
diff --git a/Allura/allura/lib/exceptions.py b/Allura/allura/lib/exceptions.py
index 4c33991..7611dd7 100644
--- a/Allura/allura/lib/exceptions.py
+++ b/Allura/allura/lib/exceptions.py
@@ -18,7 +18,14 @@
from formencode import Invalid
class ForgeError(Exception): pass
-class ProjectConflict(ForgeError, Invalid): pass
+
+class ProjectConflict(ForgeError, Invalid):
+
+ # support the single string constructor in addition to full set of params that Invalid.__init__ requires
+ def __init__(self, msg, value=None, state=None, error_list=None, error_dict=None):
+ super(ProjectConflict, self).__init__(msg, value, state, error_list, error_dict)
+
+
class ProjectShortnameInvalid(ForgeError, Invalid): pass
class ProjectOverlimitError(ForgeError): pass
class ProjectRatelimitError(ForgeError): pass
@@ -45,4 +52,3 @@
parts.append(' ' + line)
parts.append('</%s>\n' % self.__class__.__name__ )
return ''.join(parts)
-
