Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit e2ee7b4aaca9f2dc7e96d0e040dfdb1dc72674db
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 28 12:38:16 2013 +0100
Make exception names more general
- Introduce MalformedArgumentException
---------------------------------------------------------------
coprs_frontend/coprs/exceptions.py | 5 ++++-
coprs_frontend/coprs/logic/coprs_logic.py | 4 ++--
coprs_frontend/coprs/views/api_ns/api_general.py | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/coprs_frontend/coprs/exceptions.py b/coprs_frontend/coprs/exceptions.py
index 7b7fd5c..8635520 100644
--- a/coprs_frontend/coprs/exceptions.py
+++ b/coprs_frontend/coprs/exceptions.py
@@ -1,7 +1,10 @@
class ArgumentMissingException(BaseException):
pass
-class DuplicateCoprNameException(BaseException):
+class MalformedArgumentException(ValueError):
+ pass
+
+class DuplicateException(BaseException):
pass
class InsufficientRightsException(BaseException):
diff --git a/coprs_frontend/coprs/logic/coprs_logic.py
b/coprs_frontend/coprs/logic/coprs_logic.py
index a27668e..fc0293d 100644
--- a/coprs_frontend/coprs/logic/coprs_logic.py
+++ b/coprs_frontend/coprs/logic/coprs_logic.py
@@ -64,14 +64,14 @@ class CoprsLogic(object):
@classmethod
def new(cls, user, copr, check_for_duplicates = True):
if check_for_duplicates and cls.exists_for_current_user(user, copr.name).all():
- raise exceptions.DuplicateCoprNameException(
+ raise exceptions.DuplicateException(
'Copr: "{0}" already exists'.format(copr.name))
db.session.add(copr)
@classmethod
def update(cls, user, copr, check_for_duplicates = True):
if check_for_duplicates and cls.exists_for_current_user(user, copr.name).all():
- raise exceptions.DuplicateCoprNameException(
+ raise exceptions.DuplicateException(
'Copr: "{0}" already exists'.format(copr.name))
db.session.add(copr)
diff --git a/coprs_frontend/coprs/views/api_ns/api_general.py
b/coprs_frontend/coprs/views/api_ns/api_general.py
index f2d270d..735da98 100644
--- a/coprs_frontend/coprs/views/api_ns/api_general.py
+++ b/coprs_frontend/coprs/views/api_ns/api_general.py
@@ -77,7 +77,7 @@ def api_new_copr():
output = {'output': 'ok', 'message' :
'\n'.join(infos)}
db.session.commit()
- except exceptions.DuplicateCoprNameException, err:
+ except exceptions.DuplicateException, err:
output = {'output': 'notok', 'error': err}
db.session.rollback()