Index: openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl,v diff -u -r1.45.2.14 -r1.45.2.15 --- openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 25 Apr 2023 11:53:08 -0000 1.45.2.14 +++ openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 25 Apr 2023 12:00:51 -0000 1.45.2.15 @@ -72,17 +72,20 @@ } } -ad_proc -public apm_file_type_keys {} { +ad_proc -deprecated apm_file_type_keys {} { Returns a list of valid file type keys. + DEPRECATED: this api in not used in upstream code and can be + inlined by a simple dict idiom. + @see apm_file_type_names @see apm_pretty_name_for_file_type + @see dict @author Peter Marklund } { - array set file_type_names [apm_file_type_names] - return [array names file_type_names] + return [dict keys [apm_file_type_names]] } ad_proc -public apm_package_info_file_path { Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v diff -u -r1.114.2.41 -r1.114.2.42 --- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 12 Oct 2022 17:05:10 -0000 1.114.2.41 +++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 25 Apr 2023 12:00:51 -0000 1.114.2.42 @@ -741,7 +741,6 @@ Returns the pretty name corresponding to a particular file type key @see apm_file_type_names - @see apm_file_type_keys @author Peter Marklund } { Index: openacs-4/packages/acs-tcl/tcl/test/apm-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/apm-procs.tcl,v diff -u -r1.1.2.4 -r1.1.2.5 --- openacs-4/packages/acs-tcl/tcl/test/apm-procs.tcl 24 Aug 2022 14:30:28 -0000 1.1.2.4 +++ openacs-4/packages/acs-tcl/tcl/test/apm-procs.tcl 25 Apr 2023 12:00:52 -0000 1.1.2.5 @@ -59,7 +59,6 @@ -procs { apm_version_get apm_file_type_names - apm_file_type_keys } \ apm_version_api { Tests for the apm version interface @@ -69,7 +68,6 @@ set dict [apm_file_type_names] foreach name {tcl_procs tcl_init content_page} { aa_true "File type names for '$name'" {[dict exists $dict $name]} - aa_true "$name in file type keys" {$name in [apm_file_type_keys]} } set package_id [apm_package_id_from_key acs-kernel] aa_true "Kernel package_id '$package_id' plausible " {$package_id > 0}