Update Keystone code from official Github repository with branch Master on 09/01/2015.

Change-Id: I0ff6099e6e2580f87f502002a998bbfe12673498

1 files changed, 3 insertions, 2 deletions

diff --git a/keystone-moon/keystone/auth/plugins/core.py b/keystone-moon/keystone/auth/plugins/core.py
index 96a5ecf8..bcad27e5 100644
--- a/keystone-moon/keystone/auth/plugins/core.py
+++ b/keystone-moon/keystone/auth/plugins/core.py
@@ -21,6 +21,7 @@ import six
 from keystone.common import dependency
 from keystone import exception
 
+
 CONF = cfg.CONF
 LOG = log.getLogger(__name__)
 
@@ -51,7 +52,7 @@ def convert_method_list_to_integer(methods):
 
     method_ints = []
     for method in methods:
-        for k, v in six.iteritems(method_map):
+        for k, v in method_map.items():
             if v == method:
                 method_ints.append(k)
     return sum(method_ints)
@@ -71,7 +72,7 @@ def convert_integer_to_method_list(method_int):
 
     method_map = construct_method_map_from_config()
     method_ints = []
-    for k, v in six.iteritems(method_map):
+    for k, v in method_map.items():
         method_ints.append(k)
     method_ints.sort(reverse=True)