Update Keystone code from repository.

Change-Id: Ib3d0a06b10902fcc6d520f58e85aa617bc326d00

1 files changed, 0 insertions, 16 deletions

diff --git a/keystone-moon/keystone/tests/unit/__init__.py b/keystone-moon/keystone/tests/unit/__init__.py
index 837afe69..52af8dfc 100644
--- a/keystone-moon/keystone/tests/unit/__init__.py
+++ b/keystone-moon/keystone/tests/unit/__init__.py
@@ -13,22 +13,6 @@
 #    under the License.
 
 import oslo_i18n
-import six
-
-
-if six.PY3:
-    # NOTE(dstanek): This block will monkey patch libraries that are not
-    # yet supported in Python3. We do this that that it is possible to
-    # execute any tests at all. Without monkey patching modules the
-    # tests will fail with import errors.
-
-    import sys
-    from unittest import mock  # noqa: our import detection is naive?
-
-    sys.modules['ldappool'] = mock.Mock()
-    sys.modules['memcache'] = mock.Mock()
-    sys.modules['oslo_messaging'] = mock.Mock()
-    sys.modules['paste'] = mock.Mock()
 
 # NOTE(dstanek): oslo_i18n.enable_lazy() must be called before
 # keystone.i18n._() is called to ensure it has the desired lazy lookup