summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2017-05-01 22:39:35 -0500
committerPatrick Williams <patrick@stwcx.xyz>2017-05-01 22:39:43 -0500
commit50d5d260348cc7366a01df08dd55a8b710da2fe9 (patch)
tree4356016c790df91ede2ea5d5dac55a4ac6e6e297
parent678d58b8d9af310560d0a40ef1ba45e323689cfe (diff)
downloadphosphor-logging-50d5d260348cc7366a01df08dd55a8b710da2fe9.tar.gz
phosphor-logging-50d5d260348cc7366a01df08dd55a8b710da2fe9.zip
python3: iteritems does not exist
Change iteritems to items, which is slightly slower on python2 but exists in both. None of the maps manipulated by this program are large enough for the items vs iteritems to be a concern. Change-Id: I63032ddde53a116431cc2cbe01828448a4d4f328 Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
-rw-r--r--callouts/callouts-gen.mako.hpp2
-rw-r--r--tools/phosphor-logging/templates/elog-process-metadata.mako.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/callouts/callouts-gen.mako.hpp b/callouts/callouts-gen.mako.hpp
index 7d28a3a..285092e 100644
--- a/callouts/callouts-gen.mako.hpp
+++ b/callouts/callouts-gen.mako.hpp
@@ -14,7 +14,7 @@ namespace logging
constexpr auto callouts =
{
-% for key, value in sorted(calloutsMap.iteritems()):
+% for key, value in sorted(calloutsMap.items()):
std::make_tuple("${key}", "${value}"),
% endfor
};
diff --git a/tools/phosphor-logging/templates/elog-process-metadata.mako.cpp b/tools/phosphor-logging/templates/elog-process-metadata.mako.cpp
index 267413d..a846c2f 100644
--- a/tools/phosphor-logging/templates/elog-process-metadata.mako.cpp
+++ b/tools/phosphor-logging/templates/elog-process-metadata.mako.cpp
@@ -15,7 +15,7 @@ using namespace std::placeholders;
extern const std::map<metadata::Metadata,
std::function<metadata::associations::Type>> meta = {
- % for key, value in metadata_process.iteritems():
+ % for key, value in metadata_process.items():
<%
type = value.replace(".", "::")
%>\
OpenPOWER on IntegriCloud