Mercurial > p > roundup > code
view roundup/install_util.py @ 7752:b2dbab2b34bc
fix(refactor): multiple fixups using ruff linter; more testing.
Converting to using the ruff linter and its rulesets. Fixed a number
of issues.
admin.py:
sort imports
use immutable tuples as default value markers for parameters where a
None value is valid.
reduced some loops to list comprehensions for performance
used ternary to simplify some if statements
named some variables to make them less magic
(e.g. _default_savepoint_setting = 1000)
fixed some tests for argument counts < 2 becomes != 2 so 3 is an
error.
moved exception handlers outside of loops for performance where
exception handler will abort loop anyway.
renamed variables called 'id' or 'dir' as they shadow builtin
commands.
fix translations of form _("string %s" % value) -> _("string %s") %
value so translation will be looked up with the key before
substitution.
end dicts, tuples with a trailing comma to reduce missing comma
errors if modified
simplified sorted(list(self.setting.keys())) to
sorted(self.setting.keys()) as sorted consumes whole list.
in if conditions put compared variable on left and threshold condition
on right. (no yoda conditions)
multiple noqa: suppression
removed unneeded noqa as lint rulesets are a bit different
do_get - refactor output printing logic: Use fast return if not
special formatting is requested; use isinstance with a tuple
rather than two isinstance calls; cleaned up flow and removed
comments on algorithm as it can be easily read from the code.
do_filter, do_find - refactor output printing logic. Reduce
duplicate code.
do_find - renamed variable 'value' that was set inside a loop. The
loop index variable was also named 'value'.
do_pragma - added hint to use list subcommand if setting was not
found. Replaced condition 'type(x) is bool' with 'isinstance(x,
bool)' for various types.
test_admin.py
added testing for do_list
better test coverage for do_get includes: -S and -d for multilinks,
error case for -d with non-link.
better testing for do_find including all output modes
better testing for do_filter including all output modes
fixed expected output for do_pragma that now includes hint to use
pragma list if setting not found.
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Fri, 01 Mar 2024 14:53:18 -0500 |
| parents | 8e118eb20d86 |
| children |
line wrap: on
line source
# # Copyright (c) 2001 Bizar Software Pty Ltd (http://www.bizarsoftware.com.au/) # This module is free software, and you may redistribute it and/or modify # under the same terms as Python, so long as this copyright message and # disclaimer are retained in their original form. # # IN NO EVENT SHALL BIZAR SOFTWARE PTY LTD BE LIABLE TO ANY PARTY FOR # DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING # OUT OF THE USE OF THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # # BIZAR SOFTWARE PTY LTD SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, # BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS # FOR A PARTICULAR PURPOSE. THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. # """Support module to generate and check fingerprints of installed files. """ __docformat__ = 'restructuredtext' import os import shutil from hashlib import sha1 from roundup.anypy.strings import s2b sgml_file_types = [".xml", ".ent", ".html"] hash_file_types = [".py", ".sh", ".conf", ".cgi"] slast_file_types = [".css"] digested_file_types = sgml_file_types + hash_file_types + slast_file_types def extractFingerprint(lines): # get fingerprint from last line if lines[-1].startswith(b"#SHA: "): # handle .py/.sh comment return lines[-1][6:].strip() elif lines[-1].startswith(b"<!-- SHA: "): # handle xml/html files fingerprint = lines[-1][10:] fingerprint = fingerprint.replace(b'-->', b'') return fingerprint.strip() elif lines[-1].startswith(b"/* SHA: "): # handle css files fingerprint = lines[-1][8:] fingerprint = fingerprint.replace(b'*/', b'') return fingerprint.strip() return None def checkDigest(filename): """Read file, check for valid fingerprint, return TRUE if ok""" # open and read file inp = open(filename, "rb") lines = inp.readlines() inp.close() fingerprint = extractFingerprint(lines) if fingerprint is None: return 0 del lines[-1] # calculate current digest digest = sha1() for line in lines: digest.update(line) # compare current to stored digest return fingerprint == s2b(digest.hexdigest()) class DigestFile: """ A class that you can use like open() and that calculates and writes a SHA digest to the target file. """ def __init__(self, filename): self.filename = filename self.digest = sha1() self.file = open(self.filename, "wb") def write(self, data): lines = data.splitlines() # if the file is coming from an installed tracker being used as a # template, then we will want to re-calculate the SHA fingerprint = extractFingerprint(lines) if fingerprint is not None: data = b'\n'.join(lines[:-1]) + b'\n' self.file.write(data) self.digest.update(data) def close(self): file, ext = os.path.splitext(self.filename) if ext in sgml_file_types: self.file.write(s2b("<!-- SHA: %s -->\n" % (self.digest.hexdigest(),))) elif ext in hash_file_types: self.file.write(s2b("#SHA: %s\n" % (self.digest.hexdigest(),))) elif ext in slast_file_types: self.file.write(s2b("/* SHA: %s */\n" % (self.digest.hexdigest(),))) self.file.close() def copyDigestedFile(src, dst, copystat=1): """ Copy data from `src` to `dst`, adding a fingerprint to `dst`. If `copystat` is true, the file status is copied, too (like shutil.copy2). """ if os.path.isdir(dst): dst = os.path.join(dst, os.path.basename(src)) dummy, ext = os.path.splitext(src) if ext not in digested_file_types: if copystat: return shutil.copy2(src, dst) else: return shutil.copyfile(src, dst) fsrc = None fdst = None try: fsrc = open(src, 'rb') fdst = DigestFile(dst) shutil.copyfileobj(fsrc, fdst) finally: if fdst: fdst.close() if fsrc: fsrc.close() if copystat: shutil.copystat(src, dst) def test(): import sys testdata = open(sys.argv[0], 'rb').read() for ext in digested_file_types: testfile = "__digest_test" + ext out = DigestFile(testfile) out.write(testdata) out.close() assert checkDigest(testfile), "digest ok w/o modification" mod = open(testfile, 'r+b') mod.seek(0) mod.write('# changed!') mod.close() assert not checkDigest(testfile), "digest fails after modification" os.remove(testfile) if __name__ == '__main__': test() # vim: set filetype=python ts=4 sw=4 et si
