1
0
mirror of https://github.com/ciromattia/kcc synced 2025-12-12 17:26:23 +00:00

replace exit() with sys.exit() (#590)

This commit is contained in:
Alex Xu
2023-09-08 13:18:32 -07:00
committed by GitHub
parent 424118b7cd
commit 60e9f075b8
6 changed files with 11 additions and 10 deletions

View File

@@ -22,7 +22,7 @@ import sys
if sys.version_info < (3, 8, 0): if sys.version_info < (3, 8, 0):
print('ERROR: This is a Python 3.8+ script!') print('ERROR: This is a Python 3.8+ script!')
exit(1) sys.exit(1)
from multiprocessing import freeze_support, set_start_method from multiprocessing import freeze_support, set_start_method
from kindlecomicconverter.startup import startC2E from kindlecomicconverter.startup import startC2E

View File

@@ -22,7 +22,7 @@ import sys
if sys.version_info < (3, 8, 0): if sys.version_info < (3, 8, 0):
print('ERROR: This is a Python 3.8+ script!') print('ERROR: This is a Python 3.8+ script!')
exit(1) sys.exit(1)
from multiprocessing import freeze_support, set_start_method from multiprocessing import freeze_support, set_start_method
from kindlecomicconverter.startup import startC2P from kindlecomicconverter.startup import startC2P

2
kcc.py
View File

@@ -22,7 +22,7 @@ import sys
if sys.version_info < (3, 8, 0): if sys.version_info < (3, 8, 0):
print('ERROR: This is a Python 3.8+ script!') print('ERROR: This is a Python 3.8+ script!')
exit(1) sys.exit(1)
# OS specific workarounds # OS specific workarounds
import os import os

View File

@@ -1105,13 +1105,13 @@ def checkTools(source):
process.communicate() process.communicate()
if process.returncode != 0 and process.returncode != 7: if process.returncode != 0 and process.returncode != 7:
print('ERROR: 7z is missing!') print('ERROR: 7z is missing!')
exit(1) sys.exit(1)
if options.format == 'MOBI': if options.format == 'MOBI':
kindleGenExitCode = Popen('kindlegen -locale en', stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True) kindleGenExitCode = Popen('kindlegen -locale en', stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True)
kindleGenExitCode.communicate() kindleGenExitCode.communicate()
if kindleGenExitCode.returncode != 0: if kindleGenExitCode.returncode != 0:
print('ERROR: KindleGen is missing!') print('ERROR: KindleGen is missing!')
exit(1) sys.exit(1)
def checkPre(source): def checkPre(source):

View File

@@ -23,6 +23,7 @@ from hashlib import md5
from html.parser import HTMLParser from html.parser import HTMLParser
from distutils.version import StrictVersion from distutils.version import StrictVersion
from re import split from re import split
import sys
from traceback import format_tb from traceback import format_tb
@@ -133,4 +134,4 @@ def dependencyCheck(level):
missing.append('Pillow 5.2.0+') missing.append('Pillow 5.2.0+')
if len(missing) > 0: if len(missing) > 0:
print('ERROR: ' + ', '.join(missing) + ' is not installed!') print('ERROR: ' + ', '.join(missing) + ' is not installed!')
exit(1) sys.exit(1)

View File

@@ -40,16 +40,16 @@ class BuildBinaryCommand(distutils.cmd.Command):
os.system('pyinstaller -y -F -i icons/comic2ebook.icns -n "Kindle Comic Converter" -w -s kcc.py') os.system('pyinstaller -y -F -i icons/comic2ebook.icns -n "Kindle Comic Converter" -w -s kcc.py')
# TODO /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime dist/Applications/Kindle\ Comic\ Converter.app -v # TODO /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime dist/Applications/Kindle\ Comic\ Converter.app -v
os.system('appdmg kcc.json dist/KindleComicConverter_osx_' + VERSION + '.dmg') os.system('appdmg kcc.json dist/KindleComicConverter_osx_' + VERSION + '.dmg')
exit(0) sys.exit(0)
elif sys.platform == 'win32': elif sys.platform == 'win32':
os.system('pyinstaller -y -F -i icons\\comic2ebook.ico -n KCC_' + VERSION + ' -w --noupx kcc.py') os.system('pyinstaller -y -F -i icons\\comic2ebook.ico -n KCC_' + VERSION + ' -w --noupx kcc.py')
exit(0) sys.exit(0)
elif sys.platform == 'linux': elif sys.platform == 'linux':
os.system( os.system(
'pyinstaller --hidden-import=queue -y -F -i icons/comic2ebook.ico -n kcc_linux_' + VERSION + ' kcc.py') 'pyinstaller --hidden-import=queue -y -F -i icons/comic2ebook.ico -n kcc_linux_' + VERSION + ' kcc.py')
exit(0) sys.exit(0)
else: else:
exit(0) sys.exit(0)
setuptools.setup( setuptools.setup(