10:11 a.m.
Printing a full traceback here looks a bit messy and doesn't add
any useful information.
Sam Thursfield (1):
Raise clearer error on morphology parse errors
morphlib/morphologyfactory.py | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
--
1.7.7.6
10:11 a.m.
---
morphlib/morphologyfactory.py | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/morphlib/morphologyfactory.py b/morphlib/morphologyfactory.py
index 925829e..43c0600 100644
--- a/morphlib/morphologyfactory.py
+++ b/morphlib/morphologyfactory.py
@@ -49,8 +49,11 @@ class MorphologyFactory(object):
except:
text = self._autodetect_text(reponame, sha1, filename)
- morphology = morphlib.morph2.Morphology(text)
-
+ try:
+ morphology = morphlib.morph2.Morphology(text)
+ except ValueError as e:
+ raise morphlib.Error("Error parsing %s: %s" % (filename,
e.message))
+
method_name = '_check_and_tweak_%s' % morphology['kind']
if hasattr(self, method_name):
method = getattr(self, method_name)
--
1.7.7.6
12:13 p.m.
New subject: [PATCH] V2: Raise clearer error on morphology parse errors
Repository: git://roadtrain.codethink.co.uk/baserock/morph
Branch: samthursfield/clearer-morphology-parse-errors
SHA1: eb08ef73cf2a200fe4279b94792d7353b61027b5
Now with added test!
Sam Thursfield (1):
Raise clearer error on morphology parse errors
morphlib/morphologyfactory.py | 7 +++++--
morphlib/morphologyfactory_tests.py | 7 +++++++
2 files changed, 12 insertions(+), 2 deletions(-)
--
1.7.7.6
12:13 p.m.
---
morphlib/morphologyfactory.py | 7 +++++--
morphlib/morphologyfactory_tests.py | 7 +++++++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/morphlib/morphologyfactory.py b/morphlib/morphologyfactory.py
index 925829e..dd88486 100644
--- a/morphlib/morphologyfactory.py
+++ b/morphlib/morphologyfactory.py
@@ -49,8 +49,11 @@ class MorphologyFactory(object):
except:
text = self._autodetect_text(reponame, sha1, filename)
- morphology = morphlib.morph2.Morphology(text)
-
+ try:
+ morphology = morphlib.morph2.Morphology(text)
+ except ValueError as e:
+ raise morphlib.Error("Error parsing %s: %s" % (filename,
e.message))
+
method_name = '_check_and_tweak_%s' % morphology['kind']
if hasattr(self, method_name):
method = getattr(self, method_name)
diff --git a/morphlib/morphologyfactory_tests.py b/morphlib/morphologyfactory_tests.py
index cc45bb2..06cfc5c 100644
--- a/morphlib/morphologyfactory_tests.py
+++ b/morphlib/morphologyfactory_tests.py
@@ -63,6 +63,9 @@ class FakeLocalRepo(object):
"system-kind": "%(system_kind)s",
"arch": "%(arch)s"
}''',
+ 'parse-error.morph': '''{
+ "name"
+ }''',
}
def __init__(self):
@@ -230,3 +233,7 @@ class MorphologyFactoryTests(unittest.TestCase):
self.assertRaises(morphlib.Error, self.mf.get_morphology,
'reponame', 'sha1', 'system.morph')
+ def test_fails_on_parse_error(self):
+ self.assertRaises(morphlib.Error, self.mf.get_morphology,
+ 'reponame', 'sha1',
'parse-error.morph')
+
--
1.7.7.6
4:52 a.m.
New subject: [PATCH] V2: Raise clearer error on morphology parse errors
On Tue, Jul 31, 2012 at 06:13:14PM +0200, Sam Thursfield wrote:
Repository: git://roadtrain.codethink.co.uk/baserock/morph
Branch: samthursfield/clearer-morphology-parse-errors
SHA1: eb08ef73cf2a200fe4279b94792d7353b61027b5
Merged and pushed, with a small change.
The style is to wrap at 79 characters rather than 80, and we have
a test for this in the ./check script, so I broke the line up.
3961
days inactive
3962
days old
4 comments
2 participants
participants (2)
-
Richard Maw -
Sam Thursfield