From 083a06be9f96e0e19bed7642352dbf14aa267044 Mon Sep 17 00:00:00 2001 From: James Troup Date: Sun, 4 Nov 2001 22:33:22 +0000 Subject: [PATCH] string.find rather than slices, == [] removal and second open_file argument removal --- utils.py | 13 +++++++------ ziyi | 10 +++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/utils.py b/utils.py index f9d40b0c..97598f98 100644 --- a/utils.py +++ b/utils.py @@ -1,6 +1,6 @@ # Utility functions # Copyright (C) 2000, 2001 James Troup -# $Id: utils.py,v 1.34 2001-09-27 01:24:15 troup Exp $ +# $Id: utils.py,v 1.35 2001-11-04 22:33:22 troup Exp $ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,6 +29,7 @@ re_issource = re.compile (r"(.+)_(.+?)\.(orig\.tar\.gz|diff\.gz|tar\.gz|dsc)"); re_single_line_field = re.compile(r"^(\S*)\s*:\s*(.*)"); re_multi_line_field = re.compile(r"^\s(.*)"); +re_taint_free = re.compile(r"^[-+\.\w]+$"); re_parse_maintainer = re.compile(r"^\s*(\S.*\S)\s*\<([^\> \t]+)\>"); @@ -140,12 +141,12 @@ def extract_component_from_section(section): # "-----BEGIN PGP SIGNATURE-----". def parse_changes(filename, dsc_whitespace_rules): - changes_in = open_file(filename,'r'); + changes_in = open_file(filename); error = ""; changes = {}; lines = changes_in.readlines(); - if lines == []: + if not lines: raise changes_parse_error_exc, "[Empty changes file]"; # Reindex by line number so we can easily verify the format of @@ -169,13 +170,13 @@ def parse_changes(filename, dsc_whitespace_rules): if index > max(indices): raise invalid_dsc_format_exc, index; line = indexed_lines[index]; - if line[:24] != "-----BEGIN PGP SIGNATURE": + if string.find(line, "-----BEGIN PGP SIGNATURE") != 0: raise invalid_dsc_format_exc, index; inside_signature = 0; break; - if line[:24] == "-----BEGIN PGP SIGNATURE": + if string.find(line, "-----BEGIN PGP SIGNATURE") == 0: break; - if line[:29] == "-----BEGIN PGP SIGNED MESSAGE": + if string.find(line, "-----BEGIN PGP SIGNED MESSAGE") == 0: if dsc_whitespace_rules: inside_signature = 1; while index < max(indices) and line != "": diff --git a/ziyi b/ziyi index cd703342..f9642af8 100755 --- a/ziyi +++ b/ziyi @@ -3,7 +3,7 @@ # Create all the Release files # Copyright (C) 2001 Anthony Towns -# $Id: ziyi,v 1.8 2001-09-27 01:22:51 troup Exp $ +# $Id: ziyi,v 1.9 2001-11-04 22:33:22 troup Exp $ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -60,7 +60,7 @@ def print_md5_files (tree, files): path = Cnf["Dir::RootDir"] + tree + "/" for name in files: try: - file_handle = utils.open_file(path + name, "r") + file_handle = utils.open_file(path + name) except utils.cant_open_exc: print "ALERT: Couldn't open " + path + name else: @@ -74,7 +74,7 @@ def print_sha1_files (tree, files): path = Cnf["Dir::RootDir"] + tree + "/" for name in files: try: - file_handle = utils.open_file(path + name, "r") + file_handle = utils.open_file(path + name) except utils.cant_open_exc: print "ALERT: Couldn't open " + path + name else: @@ -109,7 +109,7 @@ def main (): if Options["Help"]: usage(); - if suites == []: + if not suites: suites = Cnf.SubTree("Suite").List() def real_arch(x): @@ -143,7 +143,7 @@ def main (): nonus = 1 if components != []: for c in components: - if c[:7] != "non-US/": + if string.find(c, "non-US/") != 0: nonus = 0 else: nonus = 0 -- 2.39.5