[dak/master 17/23] dak's "Dict" is a synonym of the 'dict' builtin
Signed-off-by: Chris Lamb <lamby@debian.org>
---
dak/make_suite_file_list.py | 6 +-----
daklib/utils.py | 8 ++------
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/dak/make_suite_file_list.py b/dak/make_suite_file_list.py
index d3b679e..349a4ae 100755
--- a/dak/make_suite_file_list.py
+++ b/dak/make_suite_file_list.py
@@ -54,10 +54,6 @@ Options = None #: Parsed CommandLine arguments
################################################################################
-def Dict(**dict): return dict
-
-################################################################################
-
def usage (exit_code=0):
print """Usage: dak make-suite-file-list [OPTION]
Write out file lists suitable for use with apt-ftparchive.
@@ -359,7 +355,7 @@ SELECT s.id, s.source, 'source', s.version, l.path, f.filename, c.name, f.id,
# 'id' comes from either 'binaries' or 'source', so it's not unique
unique_id += 1
- packages[unique_id] = Dict(sourceid=sourceid, pkg=pkg, arch=arch, version=version,
+ packages[unique_id] = dict(sourceid=sourceid, pkg=pkg, arch=arch, version=version,
path=path, filename=filename,
component=component, file_id=file_id,
suite=suite, filetype = filetype)
diff --git a/daklib/utils.py b/daklib/utils.py
index 276ca24..6ec92f8 100755
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -556,7 +556,7 @@ def build_file_list(changes, is_a_dsc=0, field="files", hashname="md5sum"):
(section, component) = extract_component_from_section(section)
- files[name] = Dict(size=size, section=section,
+ files[name] = dict(size=size, section=section,
priority=priority, component=component)
files[name][hashname] = md5
@@ -1093,10 +1093,6 @@ def split_args (s, dwim=1):
################################################################################
-def Dict(**dict): return dict
-
-########################################
-
def gpgv_get_status_output(cmd, status_read, status_write):
"""
Our very own version of commands.getouputstatus(), hacked to support
@@ -1364,7 +1360,7 @@ def check_signature (sig_filename, data_filename="", keyrings=None, autofetch=No
rejects.append("signature on %s does not appear to be valid [No SIG_ID]." % (sig_filename))
# Finally ensure there's not something we don't recognise
- known_keywords = Dict(VALIDSIG="",SIG_ID="",GOODSIG="",BADSIG="",ERRSIG="",
+ known_keywords = dict(VALIDSIG="",SIG_ID="",GOODSIG="",BADSIG="",ERRSIG="",
SIGEXPIRED="",KEYREVOKED="",NO_PUBKEY="",BADARMOR="",
NODATA="",NOTATION_DATA="",NOTATION_NAME="",KEYEXPIRED="")
--
1.6.3.3
Reply to: