From f5b7de0e6c48ab00bd4efbb38201b53ad94ee5e2 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Sat, 19 Aug 2017 01:38:22 +0200
Subject: [PATCH] [FIX] P3: correct more dict iterable builtins use

Some bits posterior or leftover from fffaf735f58f1ac57781c095eb552de6d1fcdc47

See also parent commit.
---
 addons/stock/models/stock_move.py | 2 +-
 doc/reference/guidelines.rst      | 5 +----
 odoo/tools/translate.py           | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py
index 6b7b74f5143..3c27e5ba6ec 100644
--- a/addons/stock/models/stock_move.py
+++ b/addons/stock/models/stock_move.py
@@ -767,7 +767,7 @@ class StockMove(models.Model):
                         grouped_move_lines_out[k] = sum(self.env['stock.move.line'].concat(*list(g)).mapped('product_qty'))
                     available_move_lines = {key: grouped_move_lines_in[key] - grouped_move_lines_out.get(key, 0) for key in grouped_move_lines_in.keys()}
                     # pop key if the quantity available amount to 0
-                    available_move_lines = dict((k, v) for k, v in available_move_lines.iteritems() if v)
+                    available_move_lines = dict((k, v) for k, v in available_move_lines.items() if v)
 
                     if not available_move_lines:
                         continue
diff --git a/doc/reference/guidelines.rst b/doc/reference/guidelines.rst
index 058fe7ffb1c..fc15c10f7ab 100644
--- a/doc/reference/guidelines.rst
+++ b/doc/reference/guidelines.rst
@@ -452,12 +452,9 @@ So, you can write ``if some_collection:`` instead of ``if len(some_collection):`
     # better
     for key in my_dict:
             "do something..."
-    # creates a temporary list
+    # accessing the key,value pair
     for key, value in my_dict.items():
             "do something..."
-    # only iterates
-    for key, value in my_dict.iteritems():
-            "do something..."
 
 - Use dict.setdefault
 
diff --git a/odoo/tools/translate.py b/odoo/tools/translate.py
index a9f8c8fd57f..c244f88e849 100644
--- a/odoo/tools/translate.py
+++ b/odoo/tools/translate.py
@@ -876,7 +876,7 @@ def trans_generate(lang, modules, cr):
                 for dummy, val in field.selection:
                     push_translation(module, 'selection', name, 0, val)
 
-        for field_name, field in record._fields.iteritems():
+        for field_name, field in record._fields.items():
             if field.translate:
                 name = model + "," + field_name
                 try: