Skip to content

Commit 7aee21a

Browse files
committed
Small update
1 parent 78711a3 commit 7aee21a

8 files changed

Lines changed: 18 additions & 22 deletions

File tree

pyneofile/__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 .pyneofile import *

pyneofile/__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

pyneofile/pyneofile.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: pyneofile.py - Last Update: 2/8/2026 Ver. 0.28.8 RC 1 - Author: cooldude2k $
17+
$FileInfo: pyneofile.py - Last Update: 2/24/2026 Ver. 0.30.0 RC 1 - Author: cooldude2k $
1818
'''
1919

2020
import io
@@ -778,8 +778,8 @@ def _get(section_dict, key, default=None):
778778
__program_alt_name__ = __program_name__
779779
__project_url__ = "https://github.com/GameMaker2k/PyNeoFile"
780780
__project_release_url__ = __project_url__+"/releases/latest"
781-
__version_info__ = (0, 28, 8, "RC 1", 1)
782-
__version_date_info__ = (2026, 2, 8, "RC 1", 1)
781+
__version_info__ = (0, 30, 0, "RC 1", 1)
782+
__version_date_info__ = (2026, 2, 24, "RC 1", 1)
783783
__version_date__ = str(__version_date_info__[0]) + "." + str(
784784
__version_date_info__[1]).zfill(2) + "." + str(__version_date_info__[2]).zfill(2)
785785
__revision__ = __version_info__[3]
@@ -6187,7 +6187,7 @@ def AppendFilesWithContentToList(infiles, dirlistfromtxt=False, extradata=[], js
61876187
if not followlink and ftype in data_types:
61886188
with open(fname, "rb") as fpc:
61896189
shutil.copyfileobj(fpc, fcontents, length=__filebuff_size__)
6190-
if(fsize is not fcontents.tell()):
6190+
if(int(fsize, 16) != fcontents.tell()):
61916191
fsize = format(int(fcontents.tell()), 'x').lower()
61926192
typechecktest = CheckCompressionType(fcontents, filestart=0, closefp=False)
61936193
fcontents.seek(0, 0)
@@ -6468,7 +6468,7 @@ def AppendFilesWithContentFromTarFileToList(infile, extradata=[], jsondata={}, c
64686468
if ftype in data_types:
64696469
fpc = tarfp.extractfile(member)
64706470
shutil.copyfileobj(fpc, fcontents, length=__filebuff_size__)
6471-
if(fsize is not fcontents.tell()):
6471+
if(int(fsize, 16) != fcontents.tell()):
64726472
fsize = format(int(fcontents.tell()), 'x').lower()
64736473
fpc.close()
64746474
typechecktest = CheckCompressionType(fcontents, filestart=0, closefp=False)
@@ -6784,7 +6784,7 @@ def AppendFilesWithContentFromBSDTarFileToList(infile, extradata=[], jsondata={}
67846784
fcontents.write(member.read())
67856785
else:
67866786
pass
6787-
if(fsize is not fcontents.tell()):
6787+
if(int(fsize, 16) != fcontents.tell()):
67886788
fsize = format(int(fcontents.tell()), 'x').lower()
67896789
typechecktest = CheckCompressionType(fcontents, filestart=0, closefp=False)
67906790
fcontents.seek(0, 0)
@@ -7032,7 +7032,7 @@ def AppendFilesWithContentFromZipFileToList(infile, extradata=[], jsondata={}, c
70327032
curcompression = "none"
70337033
if ftype == 0:
70347034
fcontents.write(zipfp.read(member.filename))
7035-
if(fsize is not fcontents.tell()):
7035+
if(int(fsize, 16) != fcontents.tell()):
70367036
fsize = format(int(fcontents.tell()), 'x').lower()
70377037
typechecktest = CheckCompressionType(fcontents, filestart=0, closefp=False)
70387038
fcontents.seek(0, 0)
@@ -7270,7 +7270,7 @@ def AppendFilesWithContentFromRarFileToList(infile, extradata=[], jsondata={}, c
72707270
curcompression = "none"
72717271
if ftype == 0:
72727272
fcontents.write(rarfp.read(member.filename))
7273-
if(fsize is not fcontents.tell()):
7273+
if(int(fsize, 16) != fcontents.tell()):
72747274
fsize = format(int(fcontents.tell()), 'x').lower()
72757275
typechecktest = CheckCompressionType(fcontents, filestart=0, closefp=False)
72767276
fcontents.seek(0, 0)

pyneofile/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 = "PyNeoFile"
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: 4 additions & 8 deletions
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: setup.py - Last Update: 2/8/2026 Ver. 0.28.8 RC 1 - Author: cooldude2k $
16+
$FileInfo: setup.py - Last Update: 2/24/2026 Ver. 0.30.0 RC 1 - Author: cooldude2k $
1717
'''
1818

1919
import os
@@ -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+"pyneofile.py")
25+
verinfofilename = os.path.realpath("."+os.path.sep+"pyneofile"+os.path.sep+"pyneofile.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 archivefile.'
8080
pymodule['platforms'] = 'OS Independent'
8181
pymodule['zipsafe'] = True
82-
if(PY2):
83-
pymodule['pymodules'] = ['pyneofile']
84-
pymodule['scripts'] = ['neofile.py']
85-
else:
86-
pymodule['pymodules'] = ['pyneofile', 'pyneofile_py3']
87-
pymodule['scripts'] = ['neofile.py', 'neofile_py3.py']
82+
pymodule['pymodules'] = ['pyneofile']
83+
pymodule['scripts'] = []
8884
pymodule['classifiers'] = [
8985
'Development Status :: 5 - Production/Stable',
9086
'Intended Audience :: Developers',

0 commit comments

Comments
 (0)