commit 9d8ba5b58cc1d33bd76a459c191896f950d5778c
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Feb 4 15:25:35 2015 +0100
Unify exception throwing in javapackages.common.xmvn.*
python/javapackages/xmvn/xmvn_config.py | 13 +++++++------
python/javapackages/xmvn/xmvn_resolve.py | 7 ++++++-
2 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/python/javapackages/xmvn/xmvn_config.py
b/python/javapackages/xmvn/xmvn_config.py
index b396072..acffc9c 100644
--- a/python/javapackages/xmvn/xmvn_config.py
+++ b/python/javapackages/xmvn/xmvn_config.py
@@ -38,13 +38,14 @@ import pyxb.utils.six as six
from pyxb.utils.six import BytesIO
from javapackages.maven.artifact import ArtifactValidationException
+from javapackages.common.exception import JavaPackagesToolsException
from lxml.etree import ElementTree, Element, SubElement
import lxml
import lxml.etree as ET
-class XMvnConfigException(Exception):
+class XMvnConfigException(JavaPackagesToolsException):
pass
@@ -119,7 +120,7 @@ class XMvnConfig(object):
def __add_config(self, level1, level2, level3=None, content=None):
if not content:
- raise Exception("Provide content as keyword argument")
+ raise XMvnConfigException("Provide content as keyword argument")
confpath = self.__get_current_config()
root = self.__init_xml()
@@ -158,9 +159,9 @@ class XMvnConfig(object):
right = s.count('}')
if left != right:
- raise Exception("Number of opening and closing "
- "parenthesis for groups of wildcard "
- "matching is different.")
+ raise XMvnConfigException("Number of opening and closing "
+ "parenthesis for groups of wildcard "
+ "matching is different.")
return left
def add_aliases(self, artifact, aliases):
@@ -288,5 +289,5 @@ class XMvnConfig(object):
for element in contentRoot:
par.append(element)
except lxml.etree.XMLSyntaxError:
- raise Exception("content is not valid content for XML node")
+ raise XMvnConfigException("content is not valid content for XML
node")
self.__write_xml(confpath, root)
diff --git a/python/javapackages/xmvn/xmvn_resolve.py
b/python/javapackages/xmvn/xmvn_resolve.py
index 597886a..d939d25 100644
--- a/python/javapackages/xmvn/xmvn_resolve.py
+++ b/python/javapackages/xmvn/xmvn_resolve.py
@@ -34,6 +34,11 @@ import os
import lxml.etree
from javapackages.common.util import execute_command
+from javapackages.common.exception import JavaPackagesToolsException
+
+
+class XMvnResolveException(JavaPackagesToolsException):
+ pass
class XMvnResolve(object):
@@ -62,7 +67,7 @@ class XMvnResolve(object):
if not test_env:
rc, stdout, stderr = execute_command(command, input=request)
if rc:
- raise Exception("xmvn-resolve failed:\n" + stderr)
+ raise XMvnResolveException("xmvn-resolve failed:\n" + stderr)
else:
stdout = ""
with open(test_env, "rb") as f:
Show replies by date