Skip to content

Commit e62beb2

Browse files
committed
Small update
1 parent c1ad274 commit e62beb2

File tree

8 files changed

+17
-21
lines changed

8 files changed

+17
-21
lines changed

pycatfile/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Copyright 2018-2026 Game Maker 2k - http://intdb.sourceforge.net/
1515
Copyright 2018-2026 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
1616
17-
$FileInfo: __init__.py - Last Update: 2/8/2026 Ver. 0.28.8 RC 1 - Author: cooldude2k $
17+
$FileInfo: __init__.py - Last Update: 2/24/2026 Ver. 0.30.0 RC 1 - Author: cooldude2k $
1818
'''
1919

2020
from .pycatfile import *

pycatfile/__main__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
Copyright 2018-2026 Game Maker 2k - http://intdb.sourceforge.net/
1414
Copyright 2018-2026 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
1515
16-
$FileInfo: __main__.py - Last Update: 2/8/2026 Ver. 0.28.8 RC 1 - Author: cooldude2k $
16+
$FileInfo: __main__.py - Last Update: 2/24/2026 Ver. 0.30.0 RC 1 - Author: cooldude2k $
1717
'''
1818

1919
from __future__ import annotations

pycatfile/pycatfile.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Copyright 2018-2026 Game Maker 2k - http://intdb.sourceforge.net/
1515
Copyright 2018-2026 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
1616
17-
$FileInfo: pycatfile.py - Last Update: 2/8/2026 Ver. 0.28.8 RC 1 - Author: cooldude2k $
17+
$FileInfo: pycatfile.py - Last Update: 2/24/2026 Ver. 0.30.0 RC 1 - Author: cooldude2k $
1818
'''
1919

2020
import io
@@ -784,8 +784,8 @@ def _get(section_dict, key, default=None):
784784
__program_alt_name__ = __program_name__
785785
__project_url__ = "https://github.com/GameMaker2k/PyCatFile"
786786
__project_release_url__ = __project_url__+"/releases/latest"
787-
__version_info__ = (0, 28, 8, "RC 1", 1)
788-
__version_date_info__ = (2026, 2, 8, "RC 1", 1)
787+
__version_info__ = (0, 30, 0, "RC 1", 1)
788+
__version_date_info__ = (2026, 2, 24, "RC 1", 1)
789789
__version_date__ = str(__version_date_info__[0]) + "." + str(
790790
__version_date_info__[1]).zfill(2) + "." + str(__version_date_info__[2]).zfill(2)
791791
__revision__ = __version_info__[3]
@@ -6193,7 +6193,7 @@ def AppendFilesWithContentToList(infiles, dirlistfromtxt=False, extradata=[], js
61936193
if not followlink and ftype in data_types:
61946194
with open(fname, "rb") as fpc:
61956195
shutil.copyfileobj(fpc, fcontents, length=__filebuff_size__)
6196-
if(fsize is not fcontents.tell()):
6196+
if(int(fsize, 16) != fcontents.tell()):
61976197
fsize = format(int(fcontents.tell()), 'x').lower()
61986198
typechecktest = CheckCompressionType(fcontents, filestart=0, closefp=False)
61996199
fcontents.seek(0, 0)
@@ -6474,7 +6474,7 @@ def AppendFilesWithContentFromTarFileToList(infile, extradata=[], jsondata={}, c
64746474
if ftype in data_types:
64756475
fpc = tarfp.extractfile(member)
64766476
shutil.copyfileobj(fpc, fcontents, length=__filebuff_size__)
6477-
if(fsize is not fcontents.tell()):
6477+
if(int(fsize, 16) != fcontents.tell()):
64786478
fsize = format(int(fcontents.tell()), 'x').lower()
64796479
fpc.close()
64806480
typechecktest = CheckCompressionType(fcontents, filestart=0, closefp=False)
@@ -6790,7 +6790,7 @@ def AppendFilesWithContentFromBSDTarFileToList(infile, extradata=[], jsondata={}
67906790
fcontents.write(member.read())
67916791
else:
67926792
pass
6793-
if(fsize is not fcontents.tell()):
6793+
if(int(fsize, 16) != fcontents.tell()):
67946794
fsize = format(int(fcontents.tell()), 'x').lower()
67956795
typechecktest = CheckCompressionType(fcontents, filestart=0, closefp=False)
67966796
fcontents.seek(0, 0)
@@ -7038,7 +7038,7 @@ def AppendFilesWithContentFromZipFileToList(infile, extradata=[], jsondata={}, c
70387038
curcompression = "none"
70397039
if ftype == 0:
70407040
fcontents.write(zipfp.read(member.filename))
7041-
if(fsize is not fcontents.tell()):
7041+
if(int(fsize, 16) != fcontents.tell()):
70427042
fsize = format(int(fcontents.tell()), 'x').lower()
70437043
typechecktest = CheckCompressionType(fcontents, filestart=0, closefp=False)
70447044
fcontents.seek(0, 0)
@@ -7276,7 +7276,7 @@ def AppendFilesWithContentFromRarFileToList(infile, extradata=[], jsondata={}, c
72767276
curcompression = "none"
72777277
if ftype == 0:
72787278
fcontents.write(rarfp.read(member.filename))
7279-
if(fsize is not fcontents.tell()):
7279+
if(int(fsize, 16) != fcontents.tell()):
72807280
fsize = format(int(fcontents.tell()), 'x').lower()
72817281
typechecktest = CheckCompressionType(fcontents, filestart=0, closefp=False)
72827282
fcontents.seek(0, 0)

pycatfile/pywwwget.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Copyright 2018-2026 Game Maker 2k - http://intdb.sourceforge.net/
1515
Copyright 2018-2026 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
1616
17-
$FileInfo: pywwwget.py - Last Update: 2/8/2026 Ver. 0.28.8 RC 1 - Author: cooldude2k $
17+
$FileInfo: pywwwget.py - Last Update: 2/24/2026 Ver. 0.30.0 RC 1 - Author: cooldude2k $
1818
'''
1919

2020
import os

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "PyCatFile"
3-
version = "0.28.8"
3+
version = "0.30.0"
44
readme = "README.md"
55
license = { text = "BSD-3-Clause" }
66
keywords = []

pyshell-old.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/
1414
Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
1515
16-
$FileInfo: pyshell-old.py - Last Update: 2/8/2026 Ver. 0.28.8 RC 1 - Author: cooldude2k $
16+
$FileInfo: pyshell-old.py - Last Update: 2/24/2026 Ver. 0.30.0 RC 1 - Author: cooldude2k $
1717
'''
1818

1919
from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes

pyshell.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/
1414
Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
1515
16-
$FileInfo: pyshell.py - Last Update: 2/8/2026 Ver. 0.28.8 RC 1 - Author: cooldude2k $
16+
$FileInfo: pyshell.py - Last Update: 2/24/2026 Ver. 0.30.0 RC 1 - Author: cooldude2k $
1717
'''
1818

1919
from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes

setup.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from setuptools import setup
2323

2424
# Open and read the version info file in a Python 2/3 compatible way
25-
verinfofilename = os.path.realpath("."+os.path.sep+os.path.sep+"pycatfile.py")
25+
verinfofilename = os.path.realpath("."+os.path.sep+"pycatfile"+os.path.sep+"pycatfile.py")
2626

2727
# Use `with` to ensure the file is properly closed after reading
2828
# In Python 2, open defaults to text mode; in Python 3, it’s better to specify encoding
@@ -79,12 +79,8 @@
7979
'longdescription'] = 'A tar like file format name catfile after unix cat command (concatenate files) .'
8080
pymodule['platforms'] = 'OS Independent'
8181
pymodule['zipsafe'] = True
82-
if(PY2):
83-
pymodule['pymodules'] = ['pycatfile']
84-
pymodule['scripts'] = ['catfile.py']
85-
else:
86-
pymodule['pymodules'] = ['pycatfile', 'pycatfile_py3']
87-
pymodule['scripts'] = ['catfile.py', 'catfile_py3.py']
82+
pymodule['pymodules'] = ['pycatfile']
83+
pymodule['scripts'] = []
8884
pymodule['classifiers'] = [
8985
'Development Status :: 5 - Production/Stable',
9086
'Intended Audience :: Developers',

0 commit comments

Comments
 (0)