PyCatFile 0.14.14__tar.gz → 0.14.16__tar.gz

{pycatfile-0.14.14 → pycatfile-0.14.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyCatFile
-Version: 0.14.14
+Version: 0.14.16
 Summary: A tar like file format name catfile after unix cat command (concatenate files) .
 Home-page: https://github.com/GameMaker2k/PyCatFile
 Download-URL: https://github.com/GameMaker2k/PyCatFile/archive/master.tar.gz

{pycatfile-0.14.14 → pycatfile-0.14.16}/PyCatFile.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyCatFile
-Version: 0.14.14
+Version: 0.14.16
 Summary: A tar like file format name catfile after unix cat command (concatenate files) .
 Home-page: https://github.com/GameMaker2k/PyCatFile
 Download-URL: https://github.com/GameMaker2k/PyCatFile/archive/master.tar.gz

{pycatfile-0.14.14 → pycatfile-0.14.16}/pycatfile.py

@@ -14,7 +14,7 @@
     Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: pycatfile.py - Last Update: 12/3/2024 Ver. 0.14.14 RC 1 - Author: cooldude2k $
+    $FileInfo: pycatfile.py - Last Update: 12/3/2024 Ver. 0.14.16 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes
@@ -303,12 +303,12 @@ __file_format_dict__ = {'format_name': __file_format_name__, 'format_magic': __f
                         'format_delimiter': __file_format_delimiter__, 'format_ver': __file_format_ver__, 'new_style': __use_new_style__, 'use_advanced_list': __use_advanced_list__, 'use_alt_inode': __use_alt_inode__}
 __project__ = __program_name__
 __project_url__ = "https://github.com/GameMaker2k/PyCatFile"
-__version_info__ = (0, 14, 14, "RC 1", 1)
+__version_info__ = (0, 14, 16, "RC 1", 1)
 __version_date_info__ = (2024, 12, 3, "RC 1", 1)
 __version_date__ = str(__version_date_info__[0]) + "." + str(
     __version_date_info__[1]).zfill(2) + "." + str(__version_date_info__[2]).zfill(2)
 __revision__ = __version_info__[3]
-__revision_id__ = "$Id: 3ddc69234c08a55463f598d89770c82c7cdf2f9b $"
+__revision_id__ = "$Id: 5d1d2c600d175bd1d827f6339caa1040307736ca $"
 if(__version_info__[4] is not None):
     __version_date_plusrc__ = __version_date__ + \
         "-" + str(__version_date_info__[4])
@@ -3504,6 +3504,18 @@ def CompressOpenFile(outfile, compressionenable=True, compressionlevel=None):
     return outfp
 
 
+def makedevalt(major, minor):
+    """
+    Replicates os.makedev functionality to create a device number.
+    :param major: Major device number
+    :param minor: Minor device number
+    :return: Device number
+    """
+    # The device number is typically represented as:
+    # (major << 8) | minor
+    return (major << 8) | minor
+
+
 def GetDevMajorMinor(fdev):
     retdev = []
     if(hasattr(os, "minor")):
@@ -4015,7 +4027,10 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compresswhol
         curfid = curfid + 1
         if(ftype == 2):
             flinkname = member.linkname
-        fdev = format(int(os.makedev(member.devmajor, member.devminor)), 'x').lower()
+        try:
+            fdev = format(int(os.makedev(member.devmajor, member.devminor)), 'x').lower()
+        except AttributeError:
+            fdev = format(int(makedevalt(member.devmajor, member.devminor)), 'x').lower()
         fdev_minor = format(int(member.devminor), 'x').lower()
         fdev_major = format(int(member.devmajor), 'x').lower()
         if(ftype == 1 or ftype == 2 or ftype == 3 or ftype == 4 or ftype == 5 or ftype == 6):
@@ -6534,7 +6549,10 @@ def TarFileToArrayAlt(infile, listonly=False, contentasfile=True, checksumtype="
         curfid = curfid + 1
         if(ftype == 2):
             flinkname = member.linkname
-        fdev = os.makedev(member.devmajor, member.devminor)
+        try:
+            fdev = os.makedev(member.devmajor, member.devminor)
+        except AttributeError:
+            fdev = makedevalt(member.devmajor, member.devminor)
         fdev_minor = member.devminor
         fdev_major = member.devmajor
         if(ftype == 1 or ftype == 2 or ftype == 3 or ftype == 4 or ftype == 5 or ftype == 6):