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

Change-Id: I0ff6099e6e2580f87f502002a998bbfe12673498

3 files changed, 37 insertions, 30 deletions

diff --git a/keystone-moon/keystone/common/kvs/backends/memcached.py b/keystone-moon/keystone/common/kvs/backends/memcached.py
index db453143..f54c1a01 100644
--- a/keystone-moon/keystone/common/kvs/backends/memcached.py
+++ b/keystone-moon/keystone/common/kvs/backends/memcached.py
@@ -23,9 +23,9 @@ from dogpile.cache import api
 from dogpile.cache.backends import memcached
 from oslo_config import cfg
 from oslo_log import log
+from six.moves import range
 
 from keystone.common.cache.backends import memcache_pool
-from keystone.common import manager
 from keystone import exception
 from keystone.i18n import _
 
@@ -73,12 +73,13 @@ class MemcachedLock(object):
         client.delete(self.key)
 
 
-class MemcachedBackend(manager.Manager):
+class MemcachedBackend(object):
     """Pivot point to leverage the various dogpile.cache memcached backends.
 
-    To specify a specific dogpile.cache memcached driver, pass the argument
-    `memcached_driver` set to one of the provided memcached drivers (at this
-    time `memcached`, `bmemcached`, `pylibmc` are valid).
+    To specify a specific dogpile.cache memcached backend, pass the argument
+    `memcached_backend` set to one of the provided memcached backends (at this
+    time `memcached`, `bmemcached`, `pylibmc` and `pooled_memcached` are
+    valid).
     """
     def __init__(self, arguments):
         self._key_mangler = None
@@ -105,13 +106,19 @@ class MemcachedBackend(manager.Manager):
         else:
             if backend not in VALID_DOGPILE_BACKENDS:
                 raise ValueError(
-                    _('Backend `%(driver)s` is not a valid memcached '
-                      'backend. Valid drivers: %(driver_list)s') %
-                    {'driver': backend,
-                     'driver_list': ','.join(VALID_DOGPILE_BACKENDS.keys())})
+                    _('Backend `%(backend)s` is not a valid memcached '
+                      'backend. Valid backends: %(backend_list)s') %
+                    {'backend': backend,
+                     'backend_list': ','.join(VALID_DOGPILE_BACKENDS.keys())})
             else:
                 self.driver = VALID_DOGPILE_BACKENDS[backend](arguments)
 
+    def __getattr__(self, name):
+        """Forward calls to the underlying driver."""
+        f = getattr(self.driver, name)
+        setattr(self, name, f)
+        return f
+
     def _get_set_arguments_driver_attr(self, exclude_expiry=False):
 
         # NOTE(morganfainberg): Shallow copy the .set_arguments dict to
diff --git a/keystone-moon/keystone/common/kvs/core.py b/keystone-moon/keystone/common/kvs/core.py
index cbbb7462..6ce7b318 100644
--- a/keystone-moon/keystone/common/kvs/core.py
+++ b/keystone-moon/keystone/common/kvs/core.py
@@ -25,7 +25,6 @@ from dogpile.core import nameregistry
 from oslo_config import cfg
 from oslo_log import log
 from oslo_utils import importutils
-import six
 
 from keystone import exception
 from keystone.i18n import _
@@ -147,24 +146,24 @@ class KeyValueStore(object):
                                             self._region.name)
 
     def _set_keymangler_on_backend(self, key_mangler):
-            try:
-                self._region.backend.key_mangler = key_mangler
-            except Exception as e:
-                # NOTE(morganfainberg): The setting of the key_mangler on the
-                # backend is used to allow the backend to
-                # calculate a hashed key value as needed. Not all backends
-                # require the ability to calculate hashed keys. If the
-                # backend does not support/require this feature log a
-                # debug line and move on otherwise raise the proper exception.
-                # Support of the feature is implied by the existence of the
-                # 'raw_no_expiry_keys' attribute.
-                if not hasattr(self._region.backend, 'raw_no_expiry_keys'):
-                    LOG.debug(('Non-expiring keys not supported/required by '
-                               '%(region)s backend; unable to set '
-                               'key_mangler for backend: %(err)s'),
-                              {'region': self._region.name, 'err': e})
-                else:
-                    raise
+        try:
+            self._region.backend.key_mangler = key_mangler
+        except Exception as e:
+            # NOTE(morganfainberg): The setting of the key_mangler on the
+            # backend is used to allow the backend to
+            # calculate a hashed key value as needed. Not all backends
+            # require the ability to calculate hashed keys. If the
+            # backend does not support/require this feature log a
+            # debug line and move on otherwise raise the proper exception.
+            # Support of the feature is implied by the existence of the
+            # 'raw_no_expiry_keys' attribute.
+            if not hasattr(self._region.backend, 'raw_no_expiry_keys'):
+                LOG.debug(('Non-expiring keys not supported/required by '
+                           '%(region)s backend; unable to set '
+                           'key_mangler for backend: %(err)s'),
+                          {'region': self._region.name, 'err': e})
+            else:
+                raise
 
     def _set_key_mangler(self, key_mangler):
         # Set the key_mangler that is appropriate for the given region being
@@ -232,7 +231,7 @@ class KeyValueStore(object):
         if config_args['lock_timeout'] > 0:
             config_args['lock_timeout'] += LOCK_WINDOW
 
-        for argument, value in six.iteritems(config_args):
+        for argument, value in config_args.items():
             arg_key = '.'.join([prefix, 'arguments', argument])
             conf_dict[arg_key] = value
 
diff --git a/keystone-moon/keystone/common/kvs/legacy.py b/keystone-moon/keystone/common/kvs/legacy.py
index ba036016..7e27d97f 100644
--- a/keystone-moon/keystone/common/kvs/legacy.py
+++ b/keystone-moon/keystone/common/kvs/legacy.py
@@ -12,8 +12,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from oslo_log import versionutils
+
 from keystone import exception
-from keystone.openstack.common import versionutils
 
 
 class DictKvs(dict):