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

Change-Id: I0ff6099e6e2580f87f502002a998bbfe12673498

2 files changed, 27 insertions, 12 deletions

diff --git a/keystone-moon/keystone/common/cache/_memcache_pool.py b/keystone-moon/keystone/common/cache/_memcache_pool.py
index b15332db..2bfcc3bb 100644
--- a/keystone-moon/keystone/common/cache/_memcache_pool.py
+++ b/keystone-moon/keystone/common/cache/_memcache_pool.py
@@ -27,7 +27,7 @@ import time
 
 import memcache
 from oslo_log import log
-from six.moves import queue
+from six.moves import queue, zip
 
 from keystone import exception
 from keystone.i18n import _
@@ -35,11 +35,22 @@ from keystone.i18n import _
 
 LOG = log.getLogger(__name__)
 
-# This 'class' is taken from http://stackoverflow.com/a/22520633/238308
-# Don't inherit client from threading.local so that we can reuse clients in
-# different threads
-_MemcacheClient = type('_MemcacheClient', (object,),
-                       dict(memcache.Client.__dict__))
+
+class _MemcacheClient(memcache.Client):
+    """Thread global memcache client
+
+    As client is inherited from threading.local we have to restore object
+    methods overloaded by threading.local so we can reuse clients in
+    different threads
+    """
+    __delattr__ = object.__delattr__
+    __getattribute__ = object.__getattribute__
+    __new__ = object.__new__
+    __setattr__ = object.__setattr__
+
+    def __del__(self):
+        pass
+
 
 _PoolItem = collections.namedtuple('_PoolItem', ['ttl', 'connection'])
 
diff --git a/keystone-moon/keystone/common/cache/backends/mongo.py b/keystone-moon/keystone/common/cache/backends/mongo.py
index b5de9bc4..cb5ad833 100644
--- a/keystone-moon/keystone/common/cache/backends/mongo.py
+++ b/keystone-moon/keystone/common/cache/backends/mongo.py
@@ -360,8 +360,12 @@ class MongoApi(object):
 
             self._assign_data_mainpulator()
             if self.read_preference:
-                self.read_preference = pymongo.read_preferences.mongos_enum(
-                    self.read_preference)
+                # pymongo 3.0 renamed mongos_enum to read_pref_mode_from_name
+                f = getattr(pymongo.read_preferences,
+                            'read_pref_mode_from_name', None)
+                if not f:
+                    f = pymongo.read_preferences.mongos_enum
+                self.read_preference = f(self.read_preference)
                 coll.read_preference = self.read_preference
             if self.w > -1:
                 coll.write_concern['w'] = self.w
@@ -395,7 +399,7 @@ class MongoApi(object):
         Refer to MongoDB documentation around TTL index for further details.
         """
         indexes = collection.index_information()
-        for indx_name, index_data in six.iteritems(indexes):
+        for indx_name, index_data in indexes.items():
             if all(k in index_data for k in ('key', 'expireAfterSeconds')):
                 existing_value = index_data['expireAfterSeconds']
                 fld_present = 'doc_date' in index_data['key'][0]
@@ -447,7 +451,7 @@ class MongoApi(object):
         doc_date = self._get_doc_date()
         insert_refs = []
         update_refs = []
-        existing_docs = self._get_results_as_dict(mapping.keys())
+        existing_docs = self._get_results_as_dict(list(mapping.keys()))
         for key, value in mapping.items():
             ref = self._get_cache_entry(key, value.payload, value.metadata,
                                         doc_date)
@@ -532,7 +536,7 @@ class BaseTransform(AbstractManipulator):
 
     def transform_incoming(self, son, collection):
         """Used while saving data to MongoDB."""
-        for (key, value) in son.items():
+        for (key, value) in list(son.items()):
             if isinstance(value, api.CachedValue):
                 son[key] = value.payload  # key is 'value' field here
                 son['meta'] = value.metadata
@@ -549,7 +553,7 @@ class BaseTransform(AbstractManipulator):
                                          ('_id', 'value', 'meta', 'doc_date')):
             payload = son.pop('value', None)
             metadata = son.pop('meta', None)
-        for (key, value) in son.items():
+        for (key, value) in list(son.items()):
             if isinstance(value, dict):
                 son[key] = self.transform_outgoing(value, collection)
         if metadata is not None: