issue #41: enforce matching pad length

rsgalloway · Sep 22, 2017 · 69b83b1 · 69b83b1
1 parent 06a6cd8
commit 69b83b1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/pyseq.py b/pyseq.py
@@ -57,7 +57,7 @@
 from glob import iglob
 from datetime import datetime
 
-__version__ = "0.5.0"
+__version__ = "0.5.1"
 
 # default serialization format string
 global_format = '%4l %h%p%t %R'
@@ -809,7 +809,9 @@ def diff(f1, f2):
         for i in range(0, len(l1)):
             m1 = l1.pop(0)
             m2 = l2.pop(0)
-            if m1.start() == m2.start() and m1.group() != m2.group():
+            if (m1.start() == m2.start()) and \
+               (m1.group() != m2.group()) and \
+               (len(m1.group()) == len(m2.group())):
                 d.append({
                     'start': m1.start(),
                     'end': m1.end(),

diff --git a/tests/test_pyseq.py b/tests/test_pyseq.py
@@ -526,19 +526,20 @@ def test_uncompress_is_working_properly_6(self):
         )
 
     def test_uncompress_is_working_properly_7(self):
-        """testing if uncompress is working properly
+        """testing if uncompress is working properly,
+        the frame 100000 does not fit inside the pad length
         """
         seq7 = uncompress(
             'a.%03d.tga 1-100000 ([1-10, 100000])',
             fmt='%h%p%t %r (%R)'
         )
         self.assertEqual(
-            'a.1-100000.tga',
+            'a.1-10.tga',
             str(seq7)
         )
 
         self.assertEqual(
-            11,
+            10,
             len(seq7)
         )