#5: Fixed usage of raise_from.

OOPMan · Jan 13, 2016 · bd78d85 · bd78d85
1 parent 59ec25a
commit bd78d85
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/rightshift/__init__.py b/rightshift/__init__.py
@@ -373,7 +373,7 @@ def __call__(self, value, **flags):
         try:
             return self.callable_object(value)
         except Exception as e:
-            raise_from(TransformationException, e)
+            raise_from(TransformationException(e.message), e)
 
 wrap = Wrap
 """

diff --git a/rightshift/extractors.py b/rightshift/extractors.py
@@ -57,7 +57,7 @@ def __call__(self, value, **flags):
         try:
             return value[self.item_or_slice]
         except Exception as e:
-            raise_from(ExtractorException, e)
+            raise_from(ExtractorException(e.message), e)
 
     def __getattr__(self, item_name):
         """
@@ -248,7 +248,7 @@ class PatternGroup(Extractor):
     A PatternGroup can be called with a string in order to attempt to extract a
     new string from that string using a regular expression.
     """
-    def __init__(self, pattern, group=1, search=True):
+    def __init__(self, pattern, group=0, search=True):
         """
         :param pattern: A string or compiled Regular Expression pattern
         :param group: A string or numeric group value
@@ -271,7 +271,7 @@ def __call__(self, value, **flags):
                 raise ExtractorException
             return match.group(flags.get('pattern_group__group', self.group))
         except Exception as e:
-            raise_from(ExtractorException, e)
+            raise_from(ExtractorException(e), e)
 
 pattern_group = PatternGroup
 """
@@ -300,7 +300,7 @@ def __call__(self, value, **flags):
         except ExtractorException:
             raise
         except Exception as e:
-            raise_from(ExtractorException, e)
+            raise_from(ExtractorException(e.message), e)
         return value
 
 coerce_to = CoerceTo

diff --git a/rightshift/matchers.py b/rightshift/matchers.py
@@ -259,7 +259,7 @@ def __call__(self, value, **flags):
         except Exception as e:
             if flags.get('comparison__falsey_exceptions', self.falsey_exceptions):
                 return False
-            raise_from(MatcherException, e)
+            raise_from(MatcherException(e.message), e)
         raise NotImplementedError
 
 compare_using = comparison = Comparison