Index: jython-2.5.2/src/org/python/modules/_collections/PyDefaultDict.java =================================================================== --- jython-2.5.2.orig/src/org/python/modules/_collections/PyDefaultDict.java 2013-10-16 22:54:45.000000000 +0200 +++ jython-2.5.2/src/org/python/modules/_collections/PyDefaultDict.java 2013-10-16 22:57:06.000000000 +0200 @@ -16,7 +16,7 @@ import org.python.expose.ExposedSet; import org.python.expose.ExposedType; -import com.google.common.collect.MapMaker; +import com.google.common.cache.CacheBuilder; import com.google.common.collect.ComputationException; import com.google.common.base.Function; import org.python.core.BuiltinDocs; @@ -53,10 +53,9 @@ public PyDefaultDict(PyType subtype) { super(subtype, false); backingMap = - new MapMaker().makeComputingMap( - new Function() { - - public PyObject apply(PyObject key) { + new CacheBuilder.build( + new CacheLoader() { + public PyObject load(PyObject key) { if (defaultFactory == Py.None) { throw Py.KeyError(key); }