Iterate python dictionaries with for k,v in dict.items()

Notes:

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@664863 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/compiler/cpp/src/generate/t_py_generator.cc b/compiler/cpp/src/generate/t_py_generator.cc
index 0b7ad85..c753b7b 100644 (file)
--- a/compiler/cpp/src/generate/t_py_generator.cc
+++ b/compiler/cpp/src/generate/t_py_generator.cc
@@ -1179,22 +1179,22 @@ void t_py_generator::generate_serialize_container(ofstream &out,
   }
 
   if (ttype->is_map()) {
-    string kiter = tmp("_kiter");
-    string viter = tmp("_viter");
+    string kiter = tmp("kiter");
+    string viter = tmp("viter");
     indent(out) << 
-      "for " << kiter << "," << viter << " in " << prefix << ":" << endl;
+      "for " << kiter << "," << viter << " in " << prefix << ".items():" << endl;
     indent_up();
     generate_serialize_map_element(out, (t_map*)ttype, kiter, viter);
     indent_down();
   } else if (ttype->is_set()) {
-    string iter = tmp("_iter");
+    string iter = tmp("iter");
     indent(out) << 
       "for " << iter << " in " << prefix << ":" << endl;
     indent_up();
     generate_serialize_set_element(out, (t_set*)ttype, iter);
     indent_down();
   } else if (ttype->is_list()) {
-    string iter = tmp("_iter");
+    string iter = tmp("iter");
     indent(out) << 
       "for " << iter << " in " << prefix << ":" << endl;
     indent_up();