Merge pull request #7 from davidblewett/rure-nonmatching-captures

davidblewett · web-flow · commit 1ddc4d2b9a7c · 2016-11-24T02:50:54.000-05:00
Rure nonmatching captures
diff --git a/rure/lib.py b/rure/lib.py
@@ -213,8 +213,8 @@ def captures(self, haystack, start=0):
         ):
             return self.capture_cls(*[
                 RureMatch(match.start, match.end)
+                    if _lib.rure_captures_at(captures, i, match) else None
                 for i in range(0, _lib.rure_captures_len(captures))
-                if _lib.rure_captures_at(captures, i, match)
             ])
 
     @accepts_bytes
@@ -235,8 +235,8 @@ def captures_iter(self, haystack, start=0):
                                            captures):
             yield self.capture_cls(*[
                 RureMatch(match.start, match.end)
+                    if _lib.rure_captures_at(captures, i, match) else None
                 for i in range(0, _lib.rure_captures_len(captures))
-                if _lib.rure_captures_at(captures, i, match)
             ])
 
     @accepts_bytes
diff --git a/rure/tests/test_regexobject.py b/rure/tests/test_regexobject.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+from __future__ import print_function
+import re
+import unittest
+
+import rure
+
+
+class TestRegexObject(unittest.TestCase):
+    def test_search(self):
+        ptn = u"(re).*(ger)"
+        email = u"tony@tiremove_thisger.net"
+        results = rure.search(ptn, email)
+        stdlib_results = re.search(ptn, email)
+        self.assertIsNotNone(results)
+        self.assertEqual(len(results.groups()),
+                         len(stdlib_results.groups()))
+
+        ptn = u"(re)|(ger)"
+        results = rure.search(ptn, email)
+        stdlib_results = re.search(ptn, email)
+        self.assertIsNotNone(results)
+        self.assertEqual(len(results.groups()),
+                         len(stdlib_results.groups()))
+        self.assertItemsEqual(results.group(0),
+                              stdlib_results.group(0))
