From: Mark Slee <mcslee@apache.org>
Date: Tue, 31 Oct 2006 05:56:27 +0000 (+0000)
Subject: Iterate python dictionaries with for k,v in dict.items()
X-Git-Tag: 0.2.0~1609
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=b39dbc5891d11131bc48098b33983d35169de6cb;p=common%2Fthrift.git

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 0b7ad855..c753b7bf 100644
--- 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();