Fileseq 2.3.1__tar.gz → 2.3.2__tar.gz

{fileseq-2.3.1/src/Fileseq.egg-info → fileseq-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Fileseq
-Version: 2.3.1
+Version: 2.3.2
 Summary: A Python library for parsing frame ranges and file sequences commonly used in VFX and Animation applications.
 Home-page: https://github.com/justinfx/fileseq
 Author: Matt Chambers

{fileseq-2.3.1 → fileseq-2.3.2/src/Fileseq.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Fileseq
-Version: 2.3.1
+Version: 2.3.2
 Summary: A Python library for parsing frame ranges and file sequences commonly used in VFX and Animation applications.
 Home-page: https://github.com/justinfx/fileseq
 Author: Matt Chambers

{fileseq-2.3.1 → fileseq-2.3.2}/src/Fileseq.egg-info/SOURCES.txt

@@ -84,6 +84,7 @@ test/seq/big.1002.ext
 test/seq/big.1003.ext
 test/seq/foo.0001.exr
 test/seq/foo.0001.jpg
+test/seq/foo.0001_1.exr
 test/seq/foo.0002.exr
 test/seq/foo.0002.jpg
 test/seq/foo.0003.exr

fileseq-2.3.2/src/fileseq/__version__.py

@@ -0,0 +1 @@
+__version__ = '2.3.2'

{fileseq-2.3.1 → fileseq-2.3.2}/src/fileseq/filesequence.py

@@ -963,9 +963,11 @@ class BaseFileSequence(typing.Generic[T]):
             path: str
             for path in filter(None, map(utils.asString, paths)):
                 frame = path[head:tail]
-                try:
-                    int(frame)
-                except ValueError:
+                # Use isdigit() instead of int() to reject PEP 515 underscore
+                # digit separators: int("1001_1") succeeds in Python 3.6+ but
+                # "1001_1" is not a valid frame number.
+                _int_part = frame.partition('.')[0]
+                if not _int_part.lstrip('-').isdigit():
                     if not allow_subframes:
                         continue
                     try:
@@ -1505,6 +1507,12 @@ class BaseFileSequence(typing.Generic[T]):
                 if len(subframe) != decimal_places:
                     continue
 
+                # Reject frames with non-digit characters such as PEP 515
+                # underscore separators (e.g. "1001_1") which int() accepts in
+                # Python 3.6+ but are not valid frame numbers.
+                if not frame.lstrip('-').isdigit():
+                    continue
+
                 has_padded_frame = check_padded(frame)
                 has_padded_subframe = check_padded(subframe)
 

{fileseq-2.3.1 → fileseq-2.3.2}/src/fileseq/frameset.py

@@ -1486,7 +1486,8 @@ class FrameSet(BaseFrameSet):
         # Dispatch to appropriate specialized method based on frame type
         # Handle empty frames by defaulting to float method
         if frames and isinstance(frames[0], decimal.Decimal):
-            yield from FrameSet._framesToFrameRangesDecimal(frames, zfill)  # type: ignore[arg-type]
+            # noinspection PyTypeChecker
+            yield from FrameSet._framesToFrameRangesDecimal(frames, zfill)
         else:
             yield from FrameSet._framesToFrameRangesFloat(frames, zfill)  # type: ignore[arg-type]
 

{fileseq-2.3.1 → fileseq-2.3.2}/test/test_unit.py

@@ -1967,7 +1967,7 @@ class AbstractBaseTests:
 
         def testFindSequencesOnDisk(self):
             seqs = self.FS.findSequencesOnDisk("seq", strictPadding=True)
-            self.assertEquals(len(seqs), 10)
+            self.assertEquals(len(seqs), 11)
 
             known = {
                 "seq/bar1000-1002,1004-1006#.exr",
@@ -1980,6 +1980,10 @@ class AbstractBaseTests:
                 "seq/baz_left.1-3#.exr",
                 "seq/baz_right.1-3#.exr",
                 "seq/big.999-1003#.ext",
+                # foo.0001_1.exr: underscore fixture for issue #158; DISK_RE
+                # parses it as basename="foo.0001_", frame="1", so it appears
+                # as a standalone sequence rather than contaminating foo.1-5#.exr
+                "seq/foo.0001_1@.exr",
             }
             found = set([str(s) for s in seqs])
             self.assertEqualPaths(found, known)
@@ -2211,6 +2215,17 @@ class AbstractBaseTests:
                     self.FS.findSequenceOnDisk(pattern, strictPadding=False)
                 self.assertEqual(str(cm.exception), 'no sequence found on disk matching ' + pattern)
 
+        def testFindSequenceOnDiskUnderscoreFrameIgnored(self):
+            # Issue #158: findSequenceOnDisk should not match filenames whose
+            # "frame" component contains an underscore (e.g. foo.0001_1.exr).
+            # Python's int() accepts underscore digit separators (PEP 515), so
+            # "1001_1" would previously be treated as a valid frame, causing
+            # "multiple sequences found on disk" errors.
+            # seq/foo.0001_1.exr is present on disk alongside seq/foo.{0001-0005}.exr
+            for strict in (False, True):
+                seq = self.FS.findSequenceOnDisk('seq/foo.#.exr', strictPadding=strict)
+                self.assertEqual(str(seq), 'seq/foo.1-5#.exr')
+
         def testFindSequenceOnDiskSubFrames(self):
             tests = [
                 ("seq/foo.#.exr", "seq/foo.1-5#.exr"),

fileseq-2.3.1/src/fileseq/__version__.py

@@ -1 +0,0 @@
-__version__ = '2.3.1'