HA
/
patool
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix spelling

This commit is contained in:
a1346054 2021-09-13 13:27:55 +00:00
parent ed10159ca5
commit 2199a6c1d0
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -45,7 +45,7 @@ update_webmeta:
git cm "Updated web meta data." git cm "Updated web meta data."
homepage: update_webmeta homepage: update_webmeta
# relase website # release website
$(MAKE) -C doc/web release $(MAKE) -C doc/web release
tag: tag:

2
doc/install.txt
View File

@ -21,7 +21,7 @@ Now install the application.
b) Installation as a normal user b) Installation as a normal user
Run ``python setup.py install --home $HOME``. Note that you have Run ``python setup.py install --home $HOME``. Note that you have
to adjust your PATH and PYTHONPATH environment variables, eg. by to adjust your PATH and PYTHONPATH environment variables, e.g. by
adding the commands ``export PYTHONPATH=$HOME/lib/python`` and adding the commands ``export PYTHONPATH=$HOME/lib/python`` and
``export PATH=$PATH:$HOME/bin`` to your shell configuration ``export PATH=$PATH:$HOME/bin`` to your shell configuration
file. file.

6
doc/patool.1
View File

@ -56,7 +56,7 @@ of helper applications. Can be given multiple times to increase
the output even more. the output even more.
.TP .TP
\fB\-\-non\-interactive\fP \fB\-\-non\-interactive\fP
Try to prevent any interactive user input (ie. prompting for passwords Try to prevent any interactive user input (i.e. prompting for passwords
or for overwriting duplicate files). Use this option with care since or for overwriting duplicate files). Use this option with care since
overwriting files or ignoring password prompts could lead to unintended overwriting files or ignoring password prompts could lead to unintended
consequences. consequences.
@ -72,7 +72,7 @@ The original archive will never be removed.
.IP "\(bu" 4 .IP "\(bu" 4
Files outside the output directory will never be created. This relies on Files outside the output directory will never be created. This relies on
archive program options to prevent unpacking of files with an absolute archive program options to prevent unpacking of files with an absolute
path name (eg. \fB\-\-no\-absolute\-filenames\fP for \fBcpio(1)\fP). path name (e.g. \fB\-\-no\-absolute\-filenames\fP for \fBcpio(1)\fP).
.PP .PP
The following commands are available. The following commands are available.
.SS extract .SS extract
@ -138,7 +138,7 @@ not smaller, the archive is left unchanged.
.SS formats .SS formats
\fBpatool\fP \fBformats\fP \fBpatool\fP \fBformats\fP
.PP .PP
Show all supported archive formats (ie. which helper applications Show all supported archive formats (i.e. which helper applications
are available). are available).
.SH HELP OPTION .SH HELP OPTION
Specifying the help option displays help for patool itself, or a Specifying the help option displays help for patool itself, or a

2
patool
View File

@ -159,7 +159,7 @@ def create_argparser():
epilog=epilog, formatter_class=argparse.RawDescriptionHelpFormatter) epilog=epilog, formatter_class=argparse.RawDescriptionHelpFormatter)
parser.add_argument('--verbose', '-v', action='count', default=0, dest='verbosity', help="verbose operation; can be given multiple times") parser.add_argument('--verbose', '-v', action='count', default=0, dest='verbosity', help="verbose operation; can be given multiple times")
parser.add_argument('--non-interactive', dest='interactive', default=True, action='store_false', parser.add_argument('--non-interactive', dest='interactive', default=True, action='store_false',
help="don't query for user input (ie. passwords or when overwriting duplicate files); use with care since overwriting files or ignoring passwords could be unintended") help="don't query for user input (i.e. passwords or when overwriting duplicate files); use with care since overwriting files or ignoring passwords could be unintended")
subparsers = parser.add_subparsers(help='the archive command; type "patool COMMAND -h" for command-specific help', dest='command') subparsers = parser.add_subparsers(help='the archive command; type "patool COMMAND -h" for command-specific help', dest='command')
# extract # extract
parser_extract = subparsers.add_parser('extract', help='extract one or more archives') parser_extract = subparsers.add_parser('extract', help='extract one or more archives')

12
patoolib/__init__.py
View File

@ -361,7 +361,7 @@ def check_archive_format (format, compression):
if format not in ArchiveFormats: if format not in ArchiveFormats:
raise util.PatoolError("unknown archive format `%s'" % format) raise util.PatoolError("unknown archive format `%s'" % format)
if compression is not None and compression not in ArchiveCompressions: if compression is not None and compression not in ArchiveCompressions:
raise util.PatoolError("unkonwn archive compression `%s'" % compression) raise util.PatoolError("unknown archive compression `%s'" % compression)
def find_archive_program (format, command, program=None, password=None): def find_archive_program (format, command, program=None, password=None):
@ -546,7 +546,7 @@ def _extract_archive(archive, verbosity=0, interactive=True, outdir=None,
cmdlist = get_archive_cmdlist(archive, compression, program, verbosity, interactive, outdir, password=password) cmdlist = get_archive_cmdlist(archive, compression, program, verbosity, interactive, outdir, password=password)
if cmdlist: if cmdlist:
# an empty command list means the get_archive_cmdlist() function # an empty command list means the get_archive_cmdlist() function
# already handled the command (eg. when it's a builtin Python # already handled the command (e.g. when it's a builtin Python
# function) # function)
run_archive_cmdlist(cmdlist, verbosity=verbosity) run_archive_cmdlist(cmdlist, verbosity=verbosity)
if do_cleanup_outdir: if do_cleanup_outdir:
@ -583,7 +583,7 @@ def _create_archive(archive, filenames, verbosity=0, interactive=True,
cmdlist = get_archive_cmdlist(archive, compression, program, verbosity, interactive, filenames, password=password) cmdlist = get_archive_cmdlist(archive, compression, program, verbosity, interactive, filenames, password=password)
if cmdlist: if cmdlist:
# an empty command list means the get_archive_cmdlist() function # an empty command list means the get_archive_cmdlist() function
# already handled the command (eg. when it's a builtin Python # already handled the command (e.g. when it's a builtin Python
# function) # function)
run_archive_cmdlist(cmdlist, verbosity=verbosity) run_archive_cmdlist(cmdlist, verbosity=verbosity)
if origarchive: if origarchive:
@ -605,7 +605,7 @@ def _handle_archive(archive, command, verbosity=0, interactive=True,
cmdlist = get_archive_cmdlist(archive, compression, program, verbosity, interactive, password=password) cmdlist = get_archive_cmdlist(archive, compression, program, verbosity, interactive, password=password)
if cmdlist: if cmdlist:
# an empty command list means the get_archive_cmdlist() function # an empty command list means the get_archive_cmdlist() function
# already handled the command (eg. when it's a builtin Python # already handled the command (e.g. when it's a builtin Python
# function) # function)
run_archive_cmdlist(cmdlist, verbosity=verbosity) run_archive_cmdlist(cmdlist, verbosity=verbosity)
@ -620,7 +620,7 @@ def get_archive_cmdlist_func (program, command, format):
module = importlib.import_module(modulename, __name__) module = importlib.import_module(modulename, __name__)
except ImportError as msg: except ImportError as msg:
raise util.PatoolError(msg) raise util.PatoolError(msg)
# get archive handler function (eg. patoolib.programs.star.extract_tar) # get archive handler function (e.g. patoolib.programs.star.extract_tar)
try: try:
archive_cmdlist_func = getattr(module, '%s_%s' % (command, format)) archive_cmdlist_func = getattr(module, '%s_%s' % (command, format))
def check_for_password_before_cmdlist_func_call(*args, **kwargs): def check_for_password_before_cmdlist_func_call(*args, **kwargs):
@ -723,7 +723,7 @@ def _recompress_archive(archive, verbosity=0, interactive=True, password=None):
"""Try to recompress an archive to smaller size.""" """Try to recompress an archive to smaller size."""
format, compression = get_archive_format(archive) format, compression = get_archive_format(archive)
if compression: if compression:
# only recompress the compression itself (eg. for .tar.xz) # only recompress the compression itself (e.g. for .tar.xz)
format = compression format = compression
tmpdir = util.tmpdir() tmpdir = util.tmpdir()
tmpdir2 = util.tmpdir() tmpdir2 = util.tmpdir()

2
patoolib/programs/p7zip.py
View File

@ -29,7 +29,7 @@ def extract_7z(archive, compression, cmd, verbosity, interactive, outdir, passwo
return cmdlist return cmdlist
def extract_7z_singlefile(archive, compression, cmd, verbosity, interactive, outdir, password=None): def extract_7z_singlefile(archive, compression, cmd, verbosity, interactive, outdir, password=None):
"""Extract a singlefile archive (eg. gzip or bzip2) with '7z e'. """Extract a singlefile archive (e.g. gzip or bzip2) with '7z e'.
This makes sure a single file and no subdirectories are created, This makes sure a single file and no subdirectories are created,
which would cause errors with patool repack.""" which would cause errors with patool repack."""
cmdlist = [cmd, 'e'] cmdlist = [cmd, 'e']

4
patoolib/util.py
View File

@ -477,7 +477,7 @@ def tmpfile (dir=None, prefix="temp", suffix=None):
def shell_quote (value): def shell_quote (value):
"""Quote all shell metacharacters in given string value with strong """Quote all shell metacharacters in given string value with strong
(ie. single) quotes, handling the single quote especially.""" (i.e. single) quotes, handling the single quote especially."""
if os.name == 'nt': if os.name == 'nt':
return shell_quote_nt(value) return shell_quote_nt(value)
return "'%s'" % value.replace("'", r"'\''") return "'%s'" % value.replace("'", r"'\''")
@ -670,7 +670,7 @@ def strlist_with_or (alist):
def is_same_file (filename1, filename2): def is_same_file (filename1, filename2):
"""Check if filename1 and filename2 point to the same file object. """Check if filename1 and filename2 point to the same file object.
There can be false negatives, ie. the result is False, but it is There can be false negatives, i.e. the result is False, but it is
the same file anyway. Reason is that network filesystems can create the same file anyway. Reason is that network filesystems can create
different paths to the same physical file. different paths to the same physical file.
""" """

2
setup.py
View File

@ -53,7 +53,7 @@ def cnormpath (path):
release_ro = re.compile(r"\(released (.+)\)") release_ro = re.compile(r"\(released (.+)\)")
def get_release_date (): def get_release_date ():
"""Parse and return relase date as string from doc/changelog.txt.""" """Parse and return release date as string from doc/changelog.txt."""
fname = os.path.join("doc", "changelog.txt") fname = os.path.join("doc", "changelog.txt")
release_date = "unknown" release_date = "unknown"
with open(fname) as fd: with open(fname) as fd:

4
tests/archives/test_tar.py
View File

@ -46,7 +46,7 @@ class TestTar (ArchiveTest):
self.archive_commands('t.tar.lzma') self.archive_commands('t.tar.lzma')
# even though clzip would support extracting .lz files, the # even though clzip would support extracting .lz files, the
# file(1) --uncompress command does not use it for achive detection # file(1) --uncompress command does not use it for archive detection
@needs_program(program) @needs_program(program)
@needs_program('lzip') @needs_program('lzip')
def test_tar_lzip (self): def test_tar_lzip (self):
@ -88,7 +88,7 @@ class TestTar (ArchiveTest):
# self.archive_commands('t.tar.lzma.foo', format="tar", compression="lzma") # self.archive_commands('t.tar.lzma.foo', format="tar", compression="lzma")
# even though clzip would support extracting .lz files, the # even though clzip would support extracting .lz files, the
# file(1) --uncompress command does not use it for achive detection # file(1) --uncompress command does not use it for archive detection
@needs_program('lzip') @needs_program('lzip')
@needs_program('file') @needs_program('file')
@needs_codec(program, 'lzip') @needs_codec(program, 'lzip')